Additionally, you may decide which automatically merged changes to keep (accept) and which to remove (reject) from the file which is to be merged.
The CSDiff screen below demonstrates one conflict and one change performed automatically:
|
By clicking on Accept or Reject on a conflict in CSDiff, the CSDiff Section Editor appears:
|
The text boxes on the left contains the conflict sections, as they appear in the original merged files. Select any text and click the arrow key to include the text in the merge result. The merge result is displayed in the right-hand text box. You may edit it as desired.
Hint: Type Control+A to select all text in the box.
Within CSDiff, you may execute the Review | Accept All command if you want to accept all changes. CSDiff will accept all automatic merges and will then loop through conflict sections and assist you in solving the conflicts. You may also select any text and use the 'Text Edit' feature to make the minor changes.