subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From JP <peters...@rocketmail.com>
Subject Re: Is there a non-interactive way to do a "your version first, then theirs" merge?
Date Tue, 01 Apr 2014 13:49:38 GMT
Thanks for the idea, Atle. I'll try it. 


-JP

On Tuesday, April 1, 2014 3:46 AM, Ræstad Atle Eivind <atle.rastad@saabgroup.com> 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
Mime
View raw message