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
0
votes
2 answers
git merge result cannot be read by diff tool
I am trying to figure out what is happening when I am merging git branches. I have a branch that has diverged ( feature_1 ) from the main branch ( develop ). I do a merge
git merge develop
and i get some expected conflicts
CONFLICT (add/add):…
browep
- 5,057
- 5
- 29
- 37
0
votes
1 answer
Is it possible to set rider as difftool in GitExtensions?
I couldn't find information on google whether you can assign the rider as a diff and merge tool in GitExtensions. There is no such option in GitExtensions by default
On GitHub Gist, there is only one mention of setting up rider as a global…
Pasha
- 3
- 2
0
votes
1 answer
Unable to use Diff Viewer & Merge Tool using TortoiseGit 2.13 and Beyond Compare 4.4.2
Unable to use Diff Viewer & Merge Tool using TortoiseGit 2.13 and Beyond Compare 4.4.2
Right click on Folder --> TortoiseGit --> Settings
Diff Viewer
Before
C:\Program Files\WinMerge\WinMergeU.exe -e -ub -dl %bname -dr %yname %base…
Shirish Patel
- 48
- 8
0
votes
1 answer
Meld does not allow me to edit files in left and right panels
I used Meld as a megetool for a couple of years and everything was fine.
To complete a conflict resolution I had to make all three panels content identical.
I was able to edit ALL THREE panels and eventually I end up with some solution.
After moving…
zamuka
- 796
- 2
- 9
- 21
0
votes
3 answers
Source tree is not launching External merge tool when I choose to resolve conflict using external merge tool
Source tree is not launching external merge tool for few files with extension .java . Source tree is showing conflicts in few files. When I select resolve conflict -> Launch external merge tool, it just shows a popup for less then one second and…
Rohit Ranjan Pandey
- 481
- 4
- 9
0
votes
1 answer
How to make git conflicted files ordered in desired way for solving
How can I make my conflicted files to come in desired order to resolve conflicts.
e.g if I have 2 branches named foo and bar
i want to merge foo into bar and git gives me conflicts as below
CONFLICT (content): Merge conflict in x.py
CONFLICT…
Mindtrix LCI
- 3
- 3
0
votes
1 answer
Having combined 2 git repos with conflicts, I want git mergetool within Powershell to always choose (m)odified for each file
Having pulled a 2nd git repo into another locally with conflicts, I want to be able to call git mergetool from within Powershell to always choose (m)odified for each file. I don't want to be prompted for manual input for each file separately.
I…
dajo
- 19
- 3
0
votes
0 answers
Which Git mergetools can I use with a custom merge driver?
I have written a custom merge driver for JSON which outputs diff3 format. All good visual mergetools I have tried insist on re-merging the file before showing the GUI. Are there any tools which can use the conflictfile with <<<<<<< ||||||| =======…
Vulume
- 15
- 5
0
votes
1 answer
Why does git mergetool show no conflicts, even though there are conflict markers present in files after a merge?
I’m checked out on feature/my-branch and running git merge dev. The conflict markers added to the file are:
<<<<<<< HEAD
let foo = "foo"
let bar = "bar"
||||||| merged common ancestors
let baz = "baz"
let bar = "bar"
=======
let…
0
votes
0 answers
Git tags still in the file while solving conflicts in Eclipse
the following situation is an example of what happens when i try to solve a conflict in Eclipse. I know i can use other ways to solve a conflict, i know how to solve conflicts, but i would like to use Eclipse and i apreciate if you could help. So,…
Diego Carjan
- 23
- 5
0
votes
2 answers
vsDiffMerge not running as Sourcetree external merge tool
I'm trying to set up vsDiffMerge (from Visual Studio Professional 2017) as my external merge/diff tool for SourceTree. However, when I try to resolve merge conflicts with the external tool, nothing happens. I know I got it to work before, but I had…
inejwstine
- 678
- 1
- 10
- 30
0
votes
1 answer
git, merge with a tool, instead of resolve with a tool
I come from mercurial, and there is this thing I don't know how to do with git.
Under mercurial, during a merge, each versions of a conflicting file (base, other and local) are presented side by side on my favorite merging tool (kdiff3 or meld). I…
yota
- 2,020
- 22
- 37
0
votes
1 answer
How can I successfully change my default mergetool utility to opendiff
I initially did the commands mentioned in How to resolve merge conflicts in Git
I did:
git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false
Then I did the commands mentioned How to use opendiff as…
mfaani
- 33,269
- 19
- 164
- 293
0
votes
1 answer
How should a mergetool indicate success of a merge?
I'm writing a program to be able to merge custom binary files. I want to let Git trust the exit code of my program, but it seems badly documented which exit codes do indicate a success.
The doc for git-mergetool states:
If the custom merge tool…
Ackdari
- 3,222
- 1
- 16
- 33
0
votes
0 answers
git mergetool says there is nothing to merge (but there is!)
Say I have a file and I have two branches: master and anotherbranch.
The current situation is that from the point of divergence, master branch has one commit (say a line in the file says "This is master") and the "anotherbranch" branch also has a…
KansaiRobot
- 7,564
- 11
- 71
- 150