Re: best strategy for long-living branches / reflective merges

2012-03-07 Thread Erik Andersson
Hi How did you solve this? Cheers / Erik On Sun, Jul 24, 2011 at 3:37 PM, Tino Schwarze wrote: > Hi there, > > I'm looking for a best practice for the following situation: We have > several long-living product branches forked off a common trunk. They > cannot closely follow trunk, that is, merg

best strategy for long-living branches / reflective merges

2011-07-24 Thread Tino Schwarze
Hi there, I'm looking for a best practice for the following situation: We have several long-living product branches forked off a common trunk. They cannot closely follow trunk, that is, merging often from trunk is not an option. Bugfixes and some features need to be backported to trunk, though. W