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

How to perform a safe Merge?

From: Sascha Müller <smsmll_at_web.de>
Date: Thu, 01 Nov 2012 20:59:12 +0100

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
Received on 2012-11-01 22:04:41 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.