Resolve Conflict
When a merge conflict arises, the Git Status column will display Conflict. Selecting Resolve Conflict launches the KDiff3 tool to allow a three-way merge to take place. When all lines that are in conflict have been merged and the file saved, the object should be committed for the conflict to be fully resolved.
Use the help provided by KDiff3 if you are unfamiliar with the tool. The most common actions to perform in KDiff3 to resolve merge conflicts are:
- In the bottom pane (Output) select the line marked ? <Merge Conflict> by clicking on the question mark (?). The line(s) you have selected will be highlighted in each of the versions shown. A (Base) represents the common ancestor file from which both changed files where created. B represents the version of the file in your local repository and C represents the version of the file in the remote repository.
- On the toolbar, select the <A> button if you wish to retain the change from the base file, select <B> if you wish to retain the change from the file in the local repository or select <C> if you wish to retain the change from the file in the remote repository.
- Once all the lines in conflict have been resolved, select Save from the menu or toolbar.