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

[TSVN] Re: Re: TortoiseMerge: Editing conflicts

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-24 18:13:37 CEST

"Dave Eccleston" wrote

> I'm disappointed you feel that way.

Maybe I am speaking out of turn. It would almost certainly be Stefan doing
the hard work. I am just a TSVN user.

> The need to edit
> conflicts comes up about half the time, and in those
> cases I end up feeling that I have wasted my time by
> even trying to use TortoiseMerge for this purpose.

I agree that if you resolve some conflicts and right at the end find a bit
which you are unable to complete, it could be frustrating. TMerge only
supports resolve-all or resolve-nothing at present.

> In time, I will become irritated enough with this
> inadequacy to discontinue use of the tool.

You can also use 3rd party diff/merge tools if you don't like TMerge, and
the help file provides links to 5 different free/shareware ones (appendix A
3.6). I have not tried any of them myself, but one of them might do what you
want. Let us know what you find.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 24 19:27:18 2004

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