On Tue, Dec 28, 2010 at 2:22 PM, Bernd Fondermann <[email protected]> wrote: > On 28.12.10 13:46, Niklas Gustavsson wrote: >> >> Hmm, given we're now both making changes to core merging in the s2s >> branch will be a mess. Rethinking this, how about we go the way you >> suggested with both working on trunk? Are you comfortable with the >> changes I'm making in core to go on trunk directly? > > Per Greg Stein's 'Lemma of Subversion Merges', mess should not be able to > happen. ;-)
ehmm :-) > Can you successfully run svn merge --reintegrate on the branch? Not without conflicts. Nothing complicated, but I'm worried as their paths diverge. /niklas
