Stack Overflow
Stack Overflow

Questions tagged [tortoisemerge]

TortoiseMerge is provided by TortoiseSVN and the default diff and merge tool of TortoiseSVN.

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

36 questions
46
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
  • 50,243
  • 26
  • 123
  • 150
39
votes
1 answer

TortoiseSVN Diff color codes

Could anyone explain the color codes when doing a diff in SVN, i.e. some lines are marked as red, yellow, blue, etc.
user1845360
  • 787
  • 2
  • 11
  • 28
21
votes
1 answer

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,000
  • 10
  • 26
21
votes
3 answers

Install just TortoiseMerge software and context menu items

I really love the TortoiseSvn diff software. I can download them standalone as a zip, but I really love when iI can select two files and then right click and from context menu click on "diff in tortoise". Is there any way I can install just this…
Noitidart
  • 30,310
  • 26
  • 103
  • 267
20
votes
2 answers

What is Reverse Merge ( Revert Merge ) in SVN, a simple explanation and the step by step processes from start to finish

What is Reverse Merge ( Revert Merge ) in SVN, a simple explanation and the step by step processes from start to finish would be great. Can someone give me the the processes, numbered if you can. And a good and simple example would be great too.
Nahser Bakht
  • 820
  • 2
  • 12
  • 26
16
votes
4 answers

What does the equal sign mean in TortoiseMerge?

In TortoiseMerge document, the equal sign means : A change has been undone by reverting to the original content of the line. The panel shows the differences between Mines or Theirs and base, my questions are : If something is removed, then minus…
kiford
  • 929
  • 1
  • 9
  • 22
12
votes
2 answers

Empty diff window with Apply Patch in TortoiseSVN

Steps: Use TortoiseSVN's context menu to select "Create Patch" On another machine do the same but select "Apply Patch" and select the file generated in step 1. A blank merge window is opened. It looks like this: The patch file is valid and I can…
idbrii
  • 9,440
  • 5
  • 50
  • 93
9
votes
7 answers

tortoise svn folder icons not coming

I have been experiencing a problem with tortoise . when i checked out the code the tortoise icons usually green or red on the folders are not coming.Any solution??? Thanks in advance.
AutoMEta
  • 1,179
  • 5
  • 21
  • 32
7
votes
2 answers

SourceTree external merge stopped working

Ive been using tortoiseMerge as external tool in source tree for a while now but today I had 3 conflicts after pull, so I fixed the first one then I wanna open the next and window pops up saying Visual merge in progress, but nothing happens,…
Honza
  • 173
  • 1
  • 13
4
votes
2 answers

Set up TortoiseMerge as external merge tool for SVN?

Is it possible to set up TortoiseMerge (comes with TortoiseSVN) to be the external merge tool that pops up when you encounter a merge conflict using the "svn merge" commandline? I have tried setting my environment variable "SVN_MERGE" to point to…
Mike Gates
  • 1,826
  • 3
  • 19
  • 39
3
votes
1 answer

tortoisemerge with Hg reports all lines as changed

I'd like to use TortoiseMerge with Mercurial to resolve conflicts, but its reporting every line in theirs and mine as added as though its not comparing properly here is my mercurial.ini: [ui] merge =…
Andrew Bullock
  • 34,331
  • 32
  • 145
  • 217
3
votes
4 answers

Using Subversion TortoiseSVN Merge Algorithm in a .NET Project

I have a whole bunch of pairs of files that have subtle differences. We use subversion for a source control, and I like the Merge/Diff utility that comes with TortoiseSVN for windows. And I can use this utility to manually compare/merge two files…
Josh Stodola
  • 77,975
  • 43
  • 178
  • 222
3
votes
3 answers

Git : how to organize two projects that have common code

How two organize two projects that have common part of code ? I have 2 projects that have common part of code, that is being changed from time to time. I use TortoiseGit. For example project 1 - master project 2 - dev-branch. As I understand…
pvllnspk
  • 5,289
  • 11
  • 52
  • 90
2
votes
1 answer

TortoiseSVN marks files as conflicted, but no conflict can be seen in TortoiseMerge

Good morning In windows explorer I can see that some files of my SVN versioned project have the Tortoise conflict icon with the corresponding .mine, .oldrevision, .newrevision files. When I open the files with TortoiseMerge (using the Edit conflicts…
mochomecha
  • 135
  • 1
  • 10
2
votes
2 answers

Starting TortoiseMerge with Console

I want to see what changes were made in a resvision compared to the previous one. At the moment I am doing it by opening my local Repo and selecting show log. There I click the option "Compare with previous revision" and it starts TortoiseMerge with…
Sebbo
  • 75
  • 9
1
2 3