[Soc-2009-dev] Merge Troubles

Joshua Leung aligorith at gmail.com
Wed Jun 24 06:49:07 CEST 2009


It seems that I once again have heaps of weird conflicts again (probably as
a result of having some commits occurring in 2.5 before my previous merge
was completed). Anyways, I'm currently unable to continue merging as
TortoiseSVN bails out on rna_object_force.c with complaints of "inconsistent
line endings".

Help on this would be great.
My last merge commit was

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/soc-2009-dev/attachments/20090624/3f725f5f/attachment.htm 

More information about the Soc-2009-dev mailing list