Nhảy tới nội dung

Resolving Merge Conflicts

When you perform operations in theBranch, situations will arise where you will need to merge two incompatible files. Such a situation is called a merge conflict.

If, after performing an operation, a merge conflict occurs, the Conflict Resolution dialog will appear.

Resolving Conflicts​

To resolve conflicts, inspect each file one by one by clicking on it.

As you select each file, the changes appear on the right, with conflicts highlighted in red. To select a resolution, click in the gutter, near the  Conflict marker. Select from the following options:

  •  Take Left
    Retain the changes on the left side, discarding the changes on the right side.
  •  Take Right
    Retain the changes on the right side, discarding the changes on the left side.
  •  Take Left and then Right
    Retain the changes on both sides, placing the changes on the right side below the changes on the left side.
  •  Take Right and then Left
    Retain the changes on both sides, placing the changes on the left side below the changes on the right side.

As you complete conflict resolution, the left side changes to reflect the results of your decisions. Once all conflicts in a file have been resolved, a check mark appears next to the file in the list.

Once all conflicts are resolved in all files, the completion button below the file list is enabled. To finalise conflict resolution, click this button. theBranch will resolve the conflicts in the manner that you instruct, and continue the operation that you started.

Aborting Conflict Resolution​

If you decide that you don't want to resolve the conflicts, you can abort conflict resolution. Aborting conflict resolution will return the repository back to the state that it was in before you started the conflict causing operation.

To abort conflict resolution, click the  Back button in the top left corner. You will be asked to confirm that you want to abort the conflict resolution.

If you are sure that you want to abort conflict resolution, click  Abort Operation button. theBranch will return the repository to the state it was in before you started the conflict causing operation.