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

Re: TortoiseMerge Save discarding changes

From: Sven Brueggemann <SBrueggemann_at_gmx.net>
Date: 2006-05-10 22:38:10 CEST

Dan Climan wrote:

> I had some changes in the trunk version of a file that I was trying to
> apply to a branch, but the changes keep getting discarded.

What do you mean with "discarded"? Do you get a conflict?

> I open TortoiseMerge and put the full path to the trunk version
> in Base File and put the path to the branch version in My File since
> this is the one I want to change.

If you're working with TSVN, it's much easier and fail-safe to let
TSVN invoke TortoiseMerge for you instead of opening it by hand. Simply
select "Edit conflicts" in the TortoiseSVN context menu of the
conflicted file. See section 5.6 in the help.

Kind regards


To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 22:38:18 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.