[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: use "their" block in TortoiseMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-16 13:41:32 CET

On Nov 15, 2007 11:39 PM, Stephen Dewey <stepheneliotdewey@gmail.com> wrote:
> I have looked through the FAQ's, help files, and other resources, but
> can't seem to find an answer to this question... I apologize if I am
> missing something obvious.
> I have a conflicted file that needs to be merged. So I right click on
> it and click "Edit conflicts." I get the TortoiseMerge tool, and see
> the conflicts. I have 3 panes - "theirs" in the upper left, "mine" in
> the upper right, and "merged" at the bottom.
> Now, according to the help file, I should only be able to edit the
> bottom pane, and I should get options for using "their" block only,
> "my" block only, "theirs" before mine, and vice-versa.
> However, what actually happens is that I can only edit the upper-right
> pane, and I don't get any option to use "their" block. I only have
> options to use my block, use my whole file, or use theirs before mine,
> or mine before theirs.

And when you do "use my block", the *bottom pane* gets modified. The
menus you get on the upper right pane are only there for your
convenience. It won't get modified itself, only the bottom pane is.

You'll get the menus on the bottom pane when you right-click on a
conflicted block (maybe you need first to left-click on it).


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Nov 16 13:41:41 2007

This is an archived mail posted to the TortoiseSVN Users mailing list.