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

Forcing conflict resolution in a merge

From: Adams, Arthur \(Aquilent\) <Arthur.Adams2_at_va.gov>
Date: 2007-10-17 18:25:49 CEST

Is there a way, when doing a merge, to say "ignore conflicts, I just
want to use the latest revision"?
Received on Wed Oct 17 18:26:50 2007

This message: [ Message body ]
Next message: Erik Huelsmann: "Re: Forcing conflict resolution in a merge"
Previous message: Kurt: "Cannot use access remote"
Next in thread: Erik Huelsmann: "Re: Forcing conflict resolution in a merge"
Reply: Erik Huelsmann: "Re: Forcing conflict resolution in a merge"
Reply: Reid Priedhorsky: "Re: Forcing conflict resolution in a merge"

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

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.