Re: What branching patterns work with Subversion reintegrate merge?

2016-03-21 Thread Bob Berger
cessfully elsewhere. Bob From: Stefan Sperling Sent: Saturday, March 19, 2016 11:10 AM To: Bob Berger Cc: users@subversion.apache.org Subject: Re: What branching patterns work with Subversion reintegrate merge? On Fri, Mar 18, 2016 at 08:22:06PM +, Bob Berger wro

What branching patterns work with Subversion reintegrate merge?

2016-03-20 Thread Bob Berger
I'm going to try to keep this simple. Wish me luck. Subversion requires you to do a sync merge from your trunk to a branch, before you can do a reintegrate merge from the branch back to the trunk. But the sync merge seems incompatible with a branching pattern where the trunk contains ongoing dev