I need to force a 3-way merge output file to be saved even if there are conflicts. The help file says:
/force Forces /automerge to create an output file with CVS-style conflict markers if conflicts are found.
However, I definitely do not want conflict markers saved in the file. I want BC3 to favor the side I specify and just save the output file. If you must alter the output file due to the conflicts, then I want a single line added to the very top of the file indicating that there were conflicts during the merge, but no markers inserted within the body of the file itself.
I am working through a project in which I am merging over 1800 files. I have follow up tools to verify whether or not a merge was successful, and the presence of conflict markers would impact the validation (because the conflict markers would be detected as invalid code).
/force Forces /automerge to create an output file with CVS-style conflict markers if conflicts are found.
However, I definitely do not want conflict markers saved in the file. I want BC3 to favor the side I specify and just save the output file. If you must alter the output file due to the conflicts, then I want a single line added to the very top of the file indicating that there were conflicts during the merge, but no markers inserted within the body of the file itself.
I am working through a project in which I am merging over 1800 files. I have follow up tools to verify whether or not a merge was successful, and the presence of conflict markers would impact the validation (because the conflict markers would be detected as invalid code).
Comment