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

RE: RE: integration of two-way merge (edit conflicts) tool possible?

From: Peter Yamamoto <yamamotop_at_page44.com>
Date: 2006-10-09 19:10:54 CEST

(Note that scooter is currently beta testing a 3-way merge, YAY!)

If you are doing "real" merges, then I highly suggest you use a 3 way merge tool to do the initial merge, you can test/verify with beyond compare (2 way diff) if there is something more complex that the 3 way merge tool does not handle easily.

I always back up my conflicted file sets (again using Beyond compare to keep folder structure in the backup location), just in case a merge goes wrong, it can be redone manually.

Peter

-----Original Message-----
From: Lübbe Onken [mailto:l.onken@rac.de]
Sent: Monday, October 09, 2006 6:19 AM
To: 'users@tortoisesvn.tigris.org'
Subject: RE: integration of two-way merge (edit conflicts) tool possible?

Sascha Bohnenkamp wrote:
> Hi
>
> we are using BeyondCompare from scootersoft heavily in our company.
> Most of our developers do like this tool for diff, merge etc.
> much more
> than the one integration into tortoise.
> Is there a way to integrate such tool for "edit-conflicts" too?
> I was not abl to do it yet.

TortoiseSVN->Settings->External Tools->Diff External Tools->Merge

Pay attention to the ballon tips. They tell you which parameters you cann pass on the command line.

Cheers
- Lübbe

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Oct 9 19:10:59 2006

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