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

Re: Can TortoiseMerge resolve all conflicts in one operation?

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Tue, 19 Feb 2008 22:22:31 +0000

On 19/02/2008, Jonathan Ashley <jonathan.ashley_at_praxis-his.com> wrote:
> Is it possible to resolve all conflicts at once using TortoiseMerge (or
> any other tool).
>
> I have a file that gets a large number of conflicts in it after merging.
> I want to resolve them all in favour of the merge-right file, but
> simply selecting 'use this file' doesn't do what I need, because it
> uses the merge-right file in its entirety. I want to keep the bits of
> the working copy file that don't cause conflicts.
>
> At the moment, it seems like writing a script to process the file with
> the conflict markers might be the best way forwards.

I think you're right. It is very unlikely we would offer a feature to
do that automatically as it just wouldn't be safe. If you get
conflicts, that means there is conflicting work, and accepting the
non-conflicting merges plus 'this file' for conflicted lines only
would be wrong in almost all cases. You'd end up with one persons
complete changes, plus an incomplete set of the other person's
changes.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-19 23:22:38 CET

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