Stack Overflow
Stack Overflow

Questions tagged [tortoisegitmerge]

TortoiseGitMerge is provided by TortoiseGit and the default diff and merge tool of TortoiseGit.

TortoiseGitMerge is part of and the default diff and merge tool.

It is based on TortoiseMerge from TortoiseSVN with special optimizations for .

14 questions
52
votes
7 answers

Can TortoiseMerge be used as a difftool with Windows Git Bash?

I'm just starting to work with Git. I would like to use TortoiseMerge as the difftool and mergetool. In my $HOME/.gitconfig I have the following sections. I've removed the user and color sections for this question. [merge] tool =…
Rich Shealer
  • 3,362
  • 1
  • 34
  • 59
29
votes
2 answers

Tortoise Git Merge Conflict Colors

What do the colors mean when resolving conflicts in TortoiseGit? E.g: There's a conflict in a file, and there's text highlighted with orange in the "theirs" window, and yellow in the "mine" window. And of course, the red text highlighted. My…
FuriousFolder
  • 1,200
  • 1
  • 12
  • 27
13
votes
2 answers

What should I do when I get "TortoiseMerge cannot be used without a base"?

I use msysgit on my windows machine for Git. I have TortoiseGit installed mainly because I like TortoiseMerge and the log feature. Most of the time, when I use git mergetool to resolve merge conflicts, TortoiseMerge opens normally and lets me merge.…
Byron Sommardahl
  • 12,743
  • 15
  • 74
  • 131
2
votes
3 answers

TortoiseGit un-checking the files will be submit the file to repository by default?

Here is my scenario: I want to resolve a conflict in my repository and, in the same time, I also want to let the user to be able to commit other files without having to commit the resolved file. I tried the following: git status: 1.txt(conflict)…
potter
  • 53
  • 5
1
vote
2 answers

How do I use tortoisegitmerge with mercurial?

I'm using mercurial for revision control in Windows, but I'd like to use a nice merge tool like TortoiseGitMerge. How can I tell Mercurial to use TortoiseGitMerge for merge conflicts?
Josh Kodroff
  • 27,301
  • 27
  • 95
  • 148
1
vote
1 answer

Using Git + TortoiseMerge, failing to load file into TortoiseMerge because of space in path name

I'm trying to use Tortoise's DiffMerge tool to resolve a git merge conflict. I've got the following my my .gitconfig: [diff] tool = tortoisediff [difftool] prompt = false [merge] tool = tortoisemerge [mergetool] prompt = false keepBackup =…
Sean Anderson
  • 27,963
  • 30
  • 126
  • 237
0
votes
0 answers

TortoiseGit - How to change encoding to koi8r?

Is it possible somehow to set encoding for entire repo in TortoiseGit or at least one file in TortoiseGitMerge to koi8r?
holden321
  • 1,166
  • 2
  • 17
  • 32
0
votes
0 answers

Is there a way to to do a 3-way TortoiseGitMerge on a file post-merge?

The 3-way merge does everything I need, but once the merge is complete it goes away. I simply want to repeat the 3-way on a single file after a completed merge, and perhaps make different choices. I know TortoiseGitMerge can do it with a command…
david.pfx
  • 10,520
  • 3
  • 30
  • 63
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

Git (via TortoiseGit) modifies compiled file when a conflict is detected making it corrupted

I'm fairly new to git so sorry for what will probably not be a 100% clear. I am working with compiled files (more precisely .acd files from Rockwell for Studio5000 in PLC industrial automation). I'm pretty sure the format of the file is not…
louloubaillargeon
  • 3
  • 1
0
votes
1 answer

Git Branch Solution

I'm facing an issue regarding git branch. I have a branch called F-branch where I want to develop new code and new features. And Later on, this is to be merged into the master branch. After merging to master, I got to realize that I just need the…
Ali Hassan
  • 1
0
votes
1 answer

git for Windows: tortoisegitmerge can only be launched from bash command line, but not git gui

I'm using 64 bit git-for-windows 2.12.2 under Windows7 64 bit system. Also, I have 64 bit TortoiseGit 2.4.0 installed under E:\Program Files\TortoiseGit. Now, I have try to set the tortoisegitmerge.exe as a merge tool, then use it under either bash…
ollydbg23
  • 1,124
  • 1
  • 12
  • 38
0
votes
2 answers

Webstorm External Merge tool

I'm trying to use an external merge tool (Tortoise Git) whitin Webstorm, but I encountered a problem. I can figure out how to replace the following placeholders in the "Parameters" input: $LOCAL, $REMOTE, $BASE and $MERGED. As you can see I have %1…
Marin Takanov
  • 1,079
  • 3
  • 19
  • 36
0
votes
1 answer

TortoiseGitMerge customization

Is there any way to make TortoiseGitMerge highlighted section be same as in TortoiseMerge without resizing window?
ZyXEL
  • 163
  • 1
  • 12