The "diffconflicts" script in the section below can be used as a mergetool that will then invoke Vimdiff.
In order to achieve the layout detailed above we need to step outside of the Vimdiff mergetool that ships with Git, and even outside of Git itself. The resolution is much clearer and since this is two-way merge all of the Vimdiff keyboard shortcuts work as intended. However, it is often most useful to view the simple comparison of just the "left" conflict and the "right" conflict.įor example, here is the same conflict as above but only diffing the conflicts themselves: It is useful to be able to quickly see the remote version of the file, or the common ancestor of both files, or even your version of the file before any automatic merging was attempted.
Displaying differences between three (or more!) versions of a file is a hard problem to solve and syntax highlighting alone just isn't well-suited to the job.
#P4MERGE AS MERGETOOL GIT WINDOWS#
Vimdiff is an excellent two-way diff viewer and many of the helper shortcuts are geared for moving changes between only two windows at a time. In many cases, however, it is simply too much noise and hides the relevant visual clues you need to solve a conflict quickly.įor example, here is the default view of the conflict shown above:
The default Vimdiff window layout presents quite a lot of useful information. The mergetool should write the result of the resolution to this file. Git has performed as much automatic conflict resolution as possible and the state of this file is a combination of both LOCAL and REMOTE with conflict markers surrounding anything that Git could not resolve itself. MERGED The file containing the conflict markers. REMOTE A temporary file containing the contents of the file to be merged. BASE A temporary file containing the common base for the merge. LOCAL A temporary file containing the contents of the file on the current branch. Recent versions of Git invoke Vimdiff with the following window layout: Invoke Vimdiff as a mergetool with git mergetool -t gvimdiff. Mergetools can help make short work of even gnarly merge conflicts. Resolving manually is fine for small conflicts and for obvious conflicts, but this can be frustrating and error-prone for large conflicts and for conflicts where each side of the changes differ only subtly.
#P4MERGE AS MERGETOOL GIT CODE#
The simplest way to resolve a Git merge conflict is to open the conflicted file with your favorite text editor and to manually find and remove the conflict markers, keeping the best version of the code from each side of the conflict, then marking the conflict as resolved in Git. If there are conflicts that Git cannot resolve itself the file is left in a conflicted state that must be resolved manually - more on this below as the MERGED version of the file. Git then replays the history of each lineage, making intelligent choices along the way about how and where code is added or moved or renamed. A simplistic explanation is that Git starts by finding the common ancestor of your local changes and the changes you are merging into yours. Git is quite good at automatically resolving conflicts. You are likely to encounter a merge conflict in Git eventually by merging one feature branch into another or by merging upstream changes into a local branch. 7 Toggle diff highlighting in a single window.
0 kommentar(er)
