a tool used to resolve merge conflicts identified by source control systems like git, Mercurial, or Subversion/svn, such as kdiff3
Questions tagged [mergetool]
155 questions
283
votes
8 answers
How can I configure KDiff3 as a merge tool and diff tool for git?
Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install the latest version available of Git and KDiff3.
When I make a merge and have…
Jose Rodriguez
- 9,753
- 13
- 36
- 52
235
votes
3 answers
How do I use vimdiff to resolve a git merge conflict?
I just merged a branch into my master in git and I got Automatic merge failed; fix conflicts and then commit the result. Now I ran git mergetool and vimdiff opened with the image below. I don't know how to use vimdiff. What does each panel here mean…
Cool Guy Yo
- 5,910
- 14
- 59
- 89
183
votes
5 answers
How to use Visual Studio Code as the default editor for Git MergeTool including for 3-way merge
Today I was trying to use the git mergetool on the Windows command prompt and realized that it was defaulting to use Vim, which is cool, but I'd prefer VS Code.
How can I have Visual Studio Code function as my GUI for handling merge conflicts (or…
Eric D. Johnson
- 10,219
- 9
- 39
- 46
68
votes
16 answers
How can I make WinMerge my git mergetool?
I'm trying to integrate WinMerge with Git as I've seen others done before on Windows 7 Ultimate.
I've followed the following steps, but an error continues to show up when I do a git mergetool which defaults to vimdiff.
Created a file called…
Wei Jin
- 701
- 1
- 6
- 3
62
votes
2 answers
What should I do when git revert aborts with an error message?
OK, so I'm getting an error sometimes when I try to revert a commit (with Git). All that I do is
git revert
and it gives me this message:
error: could not revert
hint: after resolving the conflicts, mark…
icnhzabot
- 9,801
- 5
- 21
- 9
59
votes
5 answers
Is there a way to make Git mark a file as conflicted?
It's possible to commit files that contains conflict data. Is there a way to mark these files as conflicted again, so that running git mergetool will generate the necessary files and run the merge tool?
Christian Neverdal
- 5,655
- 6
- 38
- 93
57
votes
1 answer
How to use git mergetool's filemerge
The documentation is here: http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html
A handy guide is here: http://ryanflorence.com/git-for-beginners/
However, neither of them explain how to use mergetool's filemerge.
The guide I read says…
xxjjnn
- 14,591
- 19
- 61
- 94
53
votes
4 answers
How resolve multiple conflicts with "git mergetool" without having to close the editor between files?
I've found git mergetool to be a handy utility for merging diffs visually, but the way I'm going about it seems really wonky. Essentially, my process looks like this when conflicts are reported:
Execute a git mergetool
At the prompt, hit Enter to…
Rob Wilkerson
- 40,476
- 42
- 137
- 192
47
votes
5 answers
Why can't I use TortoiseMerge as my git merge tool on Windows?
I'm trying to perform my first Git merge ever (exciting!), but can't get Git Gui (0.13.GITGUI from Git 1.7.4.msysgit.0) to recognize TortoiseMerge (1.6.11.20210 x64) on Windows 7. Based on an answer to a similar question, I've made the following…
Ben Blank
- 54,908
- 28
- 127
- 156
34
votes
6 answers
How could I force mergetool GUI (KDiff3) to be always shown?
How could I force the mergetool GUI to be always shown and disable any automatic resolving?
Sometimes when there is a conflict during a merge and I use the mergetool, it simply immediately returns after I hit Enter on question "Hit return to start…
Ondrej Peterka
- 3,349
- 4
- 35
- 49
29
votes
8 answers
Configure a merge tool for GitKraken on Windows10
I downloaded GitKraken for working with Git repositories and it works great for everything I need, but I haven't been able to configure it to use a merge tool like WinMerge or Meld.
When the program sees a conflict it shows up a button which says…
RabidTunes
- 775
- 1
- 8
- 21
29
votes
3 answers
How do I make git automatically open the mergetool if there is a merge conflict?
How do I make git automatically run git mergetool for any merge conflict? This should apply for all merges, using merge, rebase, pull, etc.
Matthew Flaschen
- 278,309
- 50
- 514
- 539
28
votes
4 answers
Rails 5: How Do I Set Up a Merge Tool to use for rails app:update?
I'm upgrading a rails 5.2.4.1 app to rails 6. There are a few config files I want to merge instead of manually adding information from a copy of the old file.
The first time I entered m to merge the file I got the following message.
Please specify…
Pamela Cook - LightBe Corp
- 3,912
- 5
- 50
- 86
23
votes
3 answers
How to use opendiff as default mergetool
Hi I am trying to use opendiff as the git mergetool, but when I run mergetool I get this error message:
The merge tool opendiff is not available as 'opendiff'
What am I doing wrong? It was working fine before, but since I installed a new harddrive…
CorpusCallosum
- 233
- 1
- 2
- 5
15
votes
4 answers
How do I check which merge tool I use?
I want to check which merge tool my git is set to - I just don't remember the name. I know I can wait till the next merge opportunity to run it via git merge tool and see what was it, but I'd like to type something like git mergetool status to see…
kiedysktos
- 3,910
- 7
- 31
- 40