[Soc-2009-dev] Merge Troubles

[Nathan Letwory]

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".

I think you should be able to do a merge while ignoring whitespace changes.

At least with a recent TortoiseSVN, when you do a merge, you can select 
this option. You'll have to check the manual how to do such a thing for 
a command-line merge.

/Nathan

> 
> 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
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Soc-2009-dev mailing list
> Soc-2009-dev at blender.org
> http://lists.blender.org/mailman/listinfo/soc-2009-dev


-- 

Nathan Letwory

http://www.planetblender.org | http://www.blender-fi.org