[Bf-committers] Advice on fixing bad merges (Shaders GSoC)

Mitchell Stokes mogurijin at gmail.com
Mon Aug 2 00:38:35 CEST 2010

The issues has been resolved now, but for future reference, this is what I

 * 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. :)

Mitchell Stokes (Moguri)

More information about the Bf-committers mailing list