[Soc-2009-dev] Merge Troubles

Joshua Leung aligorith at gmail.com
Wed Jun 24 14:17:52 CEST 2009


File Attached...


On Thu, Jun 25, 2009 at 12:16 AM, Chris Want <cwant at ualberta.ca> wrote:

> Joshua Leung 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
> > <
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074
> >
> >
> > Cheers,
> > Joshua
>
> Can you send the file from your working copy to the list?
>
> Chris
>
> _______________________________________________
> Soc-2009-dev mailing list
> Soc-2009-dev at blender.org
> http://lists.blender.org/mailman/listinfo/soc-2009-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/soc-2009-dev/attachments/20090625/d732a420/attachment-0001.htm 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rna_object_force.c
Type: application/octet-stream
Size: 16881 bytes
Desc: not available
Url : http://lists.blender.org/pipermail/soc-2009-dev/attachments/20090625/d732a420/attachment-0001.obj 


More information about the Soc-2009-dev mailing list