[Soc-2009-dev] Merge Troubles

[Jingyuan Huang]

I have the same issue here....

So I did a broken merge (well, it breaks the build), and I'm now
diffing 2.5 with my branch...) :S

Best Wishes
Jingyuan Huang
------------------------------------
Computer Graphics Lab
University of Waterloo




On Wed, Jun 24, 2009 at 12:49 AM, Joshua Leung<aligorith at gmail.com> wrote:
> Argh!
>
> 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
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074
>
> Cheers,
> Joshua
>
> _______________________________________________
> Soc-2009-dev mailing list
> Soc-2009-dev at blender.org
> http://lists.blender.org/mailman/listinfo/soc-2009-dev
>
>