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

text/x-python attachment: svnsurrender.py

Received on Thu Oct 18 18:05:08 2007

This message: [ Message body ]
Next message: nick_stolwijk_at_planet.nl: "RE: RE: Svn:ignore property and subfolders"
Previous message: Erik Huelsmann: "Re: Server choice?"
In reply to: Adams, Arthur \(Aquilent\): "Forcing conflict resolution in a merge"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]