Menu
After a merge failed with some conflicts I can list those with git diff, but git difftool won't display them with the difftool set in the config(in my case Kaleidoscope), instead it will just use normal diff.
A git difftool comparing with a previous commit will work.
Is there a way to use git difftool on merge conflicts?
Greets Jan
684
Instead of running one of the known diff tools, git difftool can be customized to run an alternative program by specifying the command line to invoke in a configuration variable difftool. <tool>. cmd . When git difftool is invoked with this tool (either through the -t or --tool option or the diff.
Concepts for resolving Git conflictsREMOTE - the head for files(s) from a remote location that you are trying to merge into your LOCAL branch. BASE - the common ancestor(s) of LOCAL and REMOTE . MERGED - the tag / HEAD object after the merge - this is saved as a new commit.
git mergetool allows you to use a GUI merge program (i.e. Meld) to resolve the merge conflicts that have occurred during a merge. Like difftool you can set the GUI program on the command line using -t <tool> / --tool=<tool> but, as before, it makes more sense to configure it in your . gitconfig file.
Try git mergetool.
92
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
