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
Visual Studio (2017) merge tool not opening with Unity managed files
I'm currently trying to maintain some basic version control (git) over my Unity projects, but I've faced a problem when trying to set up vsDiffMerge as my merge tool.
Currently, Unity's got its 'own', internal tool called UnityYAMLMerge, which may…
mdx
- 534
- 3
- 16
0
votes
1 answer
Auto merge using regex
KDiff3 has option automatic merge regular expression. In case of conflict KDiff3 resolve it automaticlly using REMOTE changes. But I want to resolve it using LOCAL changes.
My question: Is there possibility to resolve conflict automatically by some…
Egor Novikov
- 416
- 8
- 24
0
votes
1 answer
git rebase confilcts merge issues
I have 2 branches, for example branch A and B and enter the command
git rebase A B
Then conflicts occur and use
git mergetool
and have meld for mergetool.
Now Meld opens with 3 panes, left, center and right. I don't exactly understand what is…
Andreas Oikonomou
- 3,257
- 2
- 13
- 13
0
votes
1 answer
get list of modified files after git merge/git merge tool
I have a master, branch1, and branch2.
I have used 'git merge' then 'git mergetool' to merge deltas (i.e. changes between master and branch2) into branch1.
Now I would like to identify all modified files under branch1 as the result of the above…
CG Nguyen
- 97
- 6
0
votes
0 answers
p4merge tool configuration with git
I just configured gittool p4merge on my client server. When I do git mergetool, I get the pop-up for meld instead of p4merge:
{local}: modified file
{remote}: modified file
Hit return to start merge resolution tool (meld):
I checked git config…
skm_satish
- 445
- 4
- 12
0
votes
2 answers
`git mergetool`, A `fileName.~fileType` file was produced
MAC produced an README.~md file When I have solved the git conflict use the command git mergetool with Beyond Compare.
I think two ways to solve this, but I don't know which is the best practice.
What can I do to avoid produce the .~ file?
I add…
jiexishede
- 2,473
- 6
- 38
- 54
0
votes
1 answer
How to solve merge conflicts so that just two files are shown in meld
I'm using meld as mergetool for git and I'm wondering why meld always shows three files when I run git mergetool. I would prefer to see only two files in meld (the HEAD version and the version from the other branch that I want to merge).
Is it…
eztam
- 3,443
- 7
- 36
- 54
0
votes
1 answer
Error mergetool code compare in git
when I do git pull I've got some conflicts but I trying fix this conflicts with mergetool (code compare) I get this error:
my configuration of .gitconfig is this:
[core]
autocrlf=false
[difftool "codecompare"]
cmd = 'C:\\Program…
gogoru
- 376
- 2
- 19
0
votes
1 answer
Resolved issue between no commited same local system and git file
In one of git scenario, I have same not commit file on local system which is available on git Server as well. Now situation is, I haven't add these local system file and after stashing when I'm trying to pull master it prompt error to delete these…
CoDe
- 11,056
- 14
- 90
- 197
0
votes
1 answer
git selective merge when cherry-pick is not working
I have a master branch and a feature branch.
Feature branch branch has two files deleted
file1
file2
I wanna merge feature branch into master but I want to keep file1 and file2 , I don't want them to be deleted.
if I do cherry-pick on feature…
Mord Fustang
- 1,523
- 4
- 40
- 71
0
votes
0 answers
Git complains about merge conflict, but mergetool merges files automatically
I got a merge conflict:
CONFLICT (content): Merge conflict in css/styles.less
But when I run git mergetool, the mergetool is able to automatically merge the files, without conflict. (My mergetool is Visual Studio.) Both versions of the file were…
larspars
- 1,640
- 1
- 15
- 30
0
votes
1 answer
How to ignore a folder when merging source in mercurrial
I have using mercurial version control for my project.
Now I want to merge source from branch A to branch B.
And my questions are:
Is there any way to ignore some folder when merging source?
Or is there any way can I specify a folder to merge?
I…
Trung Nguyen
- 818
- 2
- 10
- 17
0
votes
1 answer
kdiff3 not available as c:/Program
I need you help here )
I started use ConEmu powershell with git
and as I was recommended i install Kdiff3 for merge procedure
I install KDiff3-64bit-Setup_0.9.98-2 version
and make changes in ginconfig
[merge]
tool = kdiff3
[mergetool "kdiff3"]
…
Niarah
- 33
- 1
- 1
- 4
0
votes
1 answer
Better tool for managing git merge conflicts ssh and windows
Ok so my setup is we have 2-3 devs setup on github, my live server is on a digital ocean droplet (believe its a VPS) and i access it via putty SSH on my windows machine.
I have tried to use linux merge tool but i am sure there is better options out…
user1547410
- 863
- 7
- 27
- 58
0
votes
0 answers
Using p4merge as mergetool
I have been trying to setup p4merge as mergetool for my command line git. I followed instructions here but I can't get it to work. All of my following commands drop me into the commandline merge and not the visual tool.
git mergetool
git mergetool…
Trunal Bhanse
- 1,651
- 1
- 17
- 27