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

Mitchell Stokes mogurijin at gmail.com
Sat Jul 31 00:38:49 CEST 2010

I'm thinking now the best idea would be to re-branch and merge the
individual revisions from my branch to the new one. I think it should work
and would be better than doing a lot of manual merging.


More information about the Bf-committers mailing list