subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bob Archer <Bob.Arc...@amsi.com>
Subject RE: How to perform a safe Merge?
Date Thu, 01 Nov 2012 21:57:19 GMT
> 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


Mime
View raw message