[Top][All Lists]

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

Re: git merge mess to sort out

From: Graham Percival
Subject: Re: git merge mess to sort out
Date: Sat, 28 May 2011 13:04:38 +0100
User-agent: Mutt/1.5.20 (2009-06-14)

On Fri, May 27, 2011 at 07:53:34PM -0600, Carl Sorensen wrote:
> 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.

Huh, I hadn't thought of that.  Yes, good idea!

- Graham

reply via email to

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