The issues has been resolved now, but for future reference, this is what I did:
* Checked out a working copy of trunk * Used TortoiseSVN to do an interactive-merge (it stops at each conflict to ask me what to do) and only grabbed the revisions from my branch that weren't merges * Committed the working copy as a new branch Everything is going well now. :) Cheers, Mitchell Stokes (Moguri) _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
