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
0 answers
Exception with git mergetool
I'm trying configure meld for windows.
Just now, I added the python variable environment and the follow steps:
git config --global merge.tool meld
git config --global mergetool.meld.path /c/Users/andarno/Downloads/meld-1.5.2/bin/meld
But when I…
Benjamin RD
- 11,516
- 14
- 87
- 157
0
votes
1 answer
How to use Beyond Compare 3 as external SVN (SlikSVN) merge and diff tool on Windows?
I want to configure SVN command line client SlikSVN with Beyond Compare 3 as external diff and merge tool. How to do this?
Jan Święcki
- 1,611
- 2
- 16
- 28
0
votes
1 answer
How can I configure sdiff as a merge tool for git?
I am still looking for a good command line (no GUI) git merge tool as I do not know vim or emacs. I found the following on how to use sdiff for merging, which seems pretty simple.
I cannot seem to make sdiff work properly. I currently have the…
Technoh
- 1,606
- 15
- 34
0
votes
2 answers
git: update a php-script but keep own changes
I'm tracking my changes on a PHP-software with git. I have only a master branch and about 10 commits, the first commit was the original version 1.0 of the software.
Now I saw, that the owner of the PHP-software released version 1.1.
What is the best…
steav8
- 11
- 2
0
votes
1 answer
git Mergetool - not able to choose which code to save
I am in the git Mergetool. I am trying to select my local changes, and when I select the dropdown to choose left, nothing happens. Here is the screenshot
Is there something I am doing wrong? Why am I not able to have the mergetool actually choose…
Genadinik
- 18,153
- 63
- 185
- 284