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

RE: How to perform a safe Merge?

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 1 Nov 2012 17:57:19 -0400

> how can I perform a 3-way Merge without (automatically) changing the
> content of any file? I am looking for a way to switch off the auto-merging, but
> still get files updated, which I have not changed.
>
> Like this:
> BASE == MINE => Use THEIRS
> BASE != MINE => Conflict
>
> Thanks in advance,
> Sascha

I think that would be...

svn update --accept mine-conflict

BOb
Received on 2012-11-01 22:57:56 CET

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.