Git has –auto hard coded as a command-line option to KDiff3, which causes the GUI not to show up if all conflicts are auto-resolvable by KDiff3. In the KDiff3 settings you can specify command line options to ignore, but putting –auto there did not work for me. As a workaround I configured my own variant … Read more
If you have the latest git, run this command line once: git config merge.tool tortoisemerge Important: Do not add a .exe extension to the command. If that fails, or if you want to add a different merge tool that git doesn’t know about, do this: Open one of the following in an editor: 64-bit git: … Read more
At first glance, it does not seem possible to reuse an external diff tool session. The git-mergetool documentation clearly states: If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable mergetool.<tool>.trustExitCode can be set to true. Otherwise, git-mergetool will prompt the user to indicate … Read more
I haven’t found any official documentation for it, but here’s the understanding I got from trial and error: There’s a split view with your two options on the left and right. You can’t edit either of those. There’s also a bottom view which you can edit. You might need to pull up on the little … Read more
If the index is already in a conflict state, simply check out the file with the –conflict=merge flag: git checkout –conflict=merge file If the index is clean because the unresolved file has been [erroneously] added, just reset it before checking it out: git reset file git checkout –conflict=merge file This will allow you to resume … Read more
Yes you will have to resolve the conflicts, mark them as so with git add or git rm and git commit The commit is not done yet, after the git revert – if you see .git/MERGE_MSG, you will see something like: Revert “adding revert” This reverts commit c1366607f15a8384434948cb0bcbf8ece48bb460. Conflicts: revert So once you resolved the … Read more
You are talking about merge tool, yet you (and some other people with answers) are configuring it as a diff tool. To configure a merge tool, you’d need to use merge.tool and mergetool configurations instead of diff.tool and difftool, like this: git config –global merge.tool winmerge git config –replace –global mergetool.winmerge.cmd “\”C:\Program Files (x86)\WinMerge\WinMergeU.exe\” -e … Read more
Update: As of Visual Studio Code 1.70 Three-way merge with improvements were added. Visuals and further explanations are available if that’s of interest to you 😉. As of Visual Studio Code 1.13 Better Merge was integrated into the core of Visual Studio Code. The way to wire them together is to modify your .gitconfig and … Read more
All four buffers provide a different view of the same file. The top left buffer (LOCAL) is how the file looked in your target branch (what you are merging into). The top right buffer (REMOTE) is how the file looked in your source branch (where you are merging from). The middle buffer (BASE) is the … Read more
These sites were very helpful, almost, mergetool and difftool. I used the global configuration, but can be used by repository without problems. You just need to execute the following commands: git config –global merge.tool kdiff3 git config –global mergetool.kdiff3.path “C:/Program Files/KDiff3/bin/kdiff3.exe” git config –global mergetool.kdiff3.trustExitCode false git config –global diff.guitool kdiff3 git config –global difftool.kdiff3.path … Read more