[Soc-2009-dev] Merge Troubles
theeth at yahoo.com
Wed Jun 24 06:58:24 CEST 2009
If you don't have modifications in those files, another solution is to remove them from your working copy, do the merge and then copy them back from a 2.5 working copy.
--- On Wed, 6/24/09, Jingyuan Huang <jingyuan.huang at gmail.com> wrote:
> From: Jingyuan Huang <jingyuan.huang at gmail.com>
> Subject: Re: [Soc-2009-dev] Merge Troubles
> To: soc-2009-dev at blender.org
> Received: Wednesday, June 24, 2009, 12:50 AM
> 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>
> > 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
> Soc-2009-dev mailing list
> Soc-2009-dev at blender.org
The new Internet Explorer® 8 - Faster, safer, easier. Optimized for Yahoo! Get it Now for Free! at http://downloads.yahoo.com/ca/internetexplorer/
More information about the Soc-2009-dev