[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git merge mess to sort out

From: Francisco Vila
Subject: Re: git merge mess to sort out
Date: Sat, 28 May 2011 08:57:49 +0200

2011/5/28 Carl Sorensen <address@hidden>:
> The merge conflicts exist probably mostly because we have snippets listed at
> both 2.13.6x and 2.15.0.  I guess once a snippet is backported to 2.13.6x,
> it should have the 2.13.6x in both stable/2.14 and master.  I haven't done
> that, so I guess it's my mess to clean up.

I think a file in two branches does not suffice to generate a
conflict; some lines should be also different to.  Anyway, glad to
hear it is resolved now.
Francisco Vila. Badajoz (Spain) ,

reply via email to

[Prev in Thread] Current Thread [Next in Thread]