Re: svn commit: r1053313 - in /mina/vysper/trunk/server/core: ./ src/main/java/org/apache/vysper/xmpp/modules/extension/xep0049_privatedata/ src/main/java/org/apache/vysper/xmpp/modules/extension/xep0054_vcardtemp/ src/main/java/org/apache/vysper/xmp

Tue, 28 Dec 2010 05:23:13 -0800 

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. ;-)

Can you successfully run svn merge --reintegrate on the branch?

  Bernd






















					Reply via email to