Re: Forcing conflict resolution in a merge

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-10-17 18:40:16 CEST

On 10/17/07, Adams, Arthur (Aquilent) <Arthur.Adams2@va.gov> wrote:
>
>
> Is there a way, when doing a merge, to say "ignore conflicts, I just want to
> use the latest revision"?

Not in current releases, but in (to be released) 1.5, this is one of
the new additions.

HTH,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 17 18:40:42 2007

This message: [ Message body ]
Next message: Rex Zhen: "svn:Mismatched RA versionfor ... found 1.4.3, expect 1.4.2"
Previous message: Adams, Arthur \(Aquilent\): "Forcing conflict resolution in a merge"
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 ]