You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Sascha Müller <sm...@web.de> on 2012/11/01 20:59:12 UTC

How to perform a safe Merge?

Hi,

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

RE: How to perform a safe Merge?

Posted by Bob Archer <Bo...@amsi.com>.

> 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