Stack Overflow
Stack Overflow

Questions tagged [mergetool]

a tool used to resolve merge conflicts identified by source control systems like git, Mercurial, or Subversion/svn, such as kdiff3

155 questions
6
votes
1 answer

git -- how to recover from unfinished merge

I started the mergetool ... > git mergetool And it said something like ... merge tool candidates: blah blah blah Merging: file1.c And then I thought, "You know, I'm not ready for this." Not knowing any clean way to shut it down, I hit ctrl-C. …
bob.sacamento
  • 6,283
  • 10
  • 56
  • 115
6
votes
1 answer

Git & WinMerge (msysgit)

I've read about a bajillion Q&A's on this very topic, and followed all the instructions to the letter. But I'm still getting headaches trying to set up Git to diff and merge using WinMerge. I've taken the following steps using the Git terminal: git…
Anthony Compton
  • 5,271
  • 3
  • 29
  • 38
6
votes
4 answers

Git Extensions and Meld merge

Is it possible to use Meld as a merge tool when using Git Extensions on Windows?
Drew Noakes
  • 300,895
  • 165
  • 679
  • 742
6
votes
2 answers

git mergetool fails

After a merge I want to use git mergetool to resolve the issue but it fails with whatever tool I specify: git mergetool merge tool…
Paul Praet
  • 1,367
  • 14
  • 25
5
votes
2 answers

vimdiff is not available as 'vim'

On Ubuntu 18.04, git mergetool --tool-help results in: 'git mergetool --tool=' may be set to one of the following: araxis The following tools are valid, but not currently available: bc bc3 codecompare deltawalker …
jsstuball
  • 4,104
  • 7
  • 33
  • 63
5
votes
2 answers

IntelliJ git merge tool

Now when I try to resolve merge conflicts through IntelliJ , I find these colours - Green , Blue , Grey and Red as shown in image below : It seems that areas marked with Green , Blue and Grey are automatically handled by Git merge if we do git…
Number945
  • 4,631
  • 8
  • 45
  • 83
5
votes
2 answers

Enable edit mode in 3-way diff using sublimerge

I'm trying to integrate sublime and git together and sublimerge seems to be a great tool except that I can't find a way to allow manual edits when doing a 3-way diff (e.g. a resolve a merge conflict). Does anyone know of a way to do this (in any…
Tom Rees
  • 455
  • 2
  • 10
4
votes
3 answers

How to make git work with vimdiff and trustExitCode

I have configured vimdiff as mergetool for git. Whenever i do a merge, git never asks wether the merge was successful. I also tried: git config --global mergetool.vimdiff.trustExitCode false with no difference. Still no question after i leave…
Michael Härtl
  • 8,428
  • 5
  • 35
  • 62
4
votes
1 answer

Handling [re]moved lines with Meld visual diff and merge tool

I have a question about the Meld visual diff and merge tool, which is probably a simple misunderstanding. But how do I adopt lines that were removed in the $REMOTE? Please see the screenshot below for an example. I have changed the order of the…
jeverling
  • 2,004
  • 1
  • 20
  • 21
4
votes
1 answer

Possible to ask "git mergetool" to automatically keep trying other files even if merging one file fails?

I am trying to build a custom mergetool for git that knows more about specific files than git does. This program will analyze the files that pop up during a merge conflict and for some of them, in some specific cases, it will know how to handle them…
Lasse V. Karlsen
  • 380,855
  • 102
  • 628
  • 825
4
votes
2 answers

git - set KDiff3 as default mergetool

After installing KDiff3 for managing conflicts in git, still the default one is opening for me: Here is the configuration that mentioned in this answer: git config --global --add merge.tool kdiff3 git config --global --add mergetool.kdiff3.path…
Vahid Najafi
  • 4,654
  • 11
  • 43
  • 88
4
votes
1 answer

Git (windows); P4merge as mergetool error

I've tried setting up p4merge as my mergetool, but I can't seem to get it working. Here's my commands: git config --global merge.tool p4merge git config --global mergetool.p4merge.path "C:/Program Files/Perforce/p4merge.exe" git config --global…
Fillip Peyton
  • 3,637
  • 2
  • 32
  • 60
4
votes
1 answer

git vimdiff mergetool basic commands?

I have executed git mergetool to try to resolve some merge conflicts. It opens 3 text windows (within my SSH terminal) with different versions of code in each. The code I want is in the window on the right. How do I tell git to take this version and…
Alex R
  • 11,364
  • 15
  • 100
  • 180
4
votes
2 answers

How to perform a 3-way visual diff on git?

I'd like to do a 3-way diff of a single file that exist in 2 different branches, that is, the last commit in each branch and also consider the common ancestor. I want to use an external tool that allows to do 3-way comparison. I was considering to…
Sergio
  • 311
  • 1
  • 4
  • 7
4
votes
3 answers

console UI tool for resolving merge conflicts in git... like vimdiff but 'easier'

i'm looking for a console UI tool for resolving merge conflicts in git... like vimdiff but 'easier'
arod
  • 13,481
  • 6
  • 31
  • 39
1 2
3
…
10 11