Is there a non-interactive way to do a "your version first, then theirs" merge?
From: JP <petersens_at_rocketmail.com>
Date: Mon, 31 Mar 2014 05:36:10 -0700 (PDT)
I'm currently using svn 1.8.5 on the client and 1.8.3 on the server.
If you attempt to "svn merge" a text file from the command-line where
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
If you then choose "m" for merge, you will see this menu:
Select: (1) use their version, (2) use your version,
Choosing either (12) or (21) here will perform an additive merge where
Thanks in advance for any replies.
-JP
|
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.