Individual file merge . Merging a newly added file

in/svn/foo/branches/bar/newfile.txt is in status "A" . How can I do such merges . JP

Re: Is there a non-interactive way to do a "your version first, then theirs" merge?

Thanks for the idea, Atle. I'll try it. -JP On Tuesday, April 1, 2014 3:46 AM, Ræstad Atle Eivind wrote: > In the meantime, can you think of any workaround ... As a workaround you might use Expect (http://en.wikipedia.org/wiki/Expect) in your script. /Atle

Re: Is there a non-interactive way to do a "your version first, then theirs" merge?

, not merge), in conjunction with some specially scripted or flagged invocation of GNU diff3? Let me know if you have any ideas. Much thanks, -JP On Monday, March 31, 2014 9:33 AM, Stefan Sperling wrote: On Mon, Mar 31, 2014 at 05:36:10AM -0700, JP wrote: > I'm currently using svn

Is there a non-interactive way to do a "your version first, then theirs" merge?

cept options that can be used with "svn merge" would seem to trigger this behavior. Am I missing something, or are these additive merges only possible in interactive mode? Thanks in advance for any replies. -JP