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

Re: Forcing conflict resolution in a merge

From: Reid Priedhorsky <reid_at_umn.edu>
Date: 2007-10-18 18:04:18 CEST

Adams, Arthur (Aquilent) wrote:
> Is there a way, when doing a merge, to say "ignore conflicts, I just
> want to use the latest revision"?

I use the attached script. It's not that great, but it works for us. I
would urge much caution: in particular, it may have assumptions that are
not appropriate for your use case.

Reid

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Received on Thu Oct 18 18:05:08 2007

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

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