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

Can TortoiseMerge resolve all conflicts in one operation?

From: Jonathan Ashley <jonathan.ashley_at_praxis-his.com>
Date: Tue, 19 Feb 2008 11:01:31 +0000

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.

Thanks,

--
Jon Ashley
This email is confidential and intended solely for the use of the individual to whom it is addressed. If you are not the intended recipient, be advised that you have received this email in error and that any use, disclosure, copying or distribution or any action taken or omitted to be taken in reliance on it is strictly prohibited. If you have received this email in error please contact the sender. Any views or opinions presented in this email are solely those of the author and do not necessarily represent those of Praxis. 
Although this email and any attachments are believed to be free of any virus or other defect, no responsibility is accepted by Praxis or any of its associated companies for any loss or damage arising in any way from the receipt or use thereof. The IT Department at Praxis can be contacted at it.support_at_praxis-his.com.
Praxis High Integrity Systems Ltd:
Company Number: 3302507, registered in England and Wales
Registered Address: 20 Manvers Street, Bath. BA1 1PX
VAT Registered in Great Britain: 682635707
---------------------------------------------------------------------
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 12:01:45 CET

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