From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <Bruce.Ashfield@windriver.com>
Received: by yocto-www.yoctoproject.org (Postfix, from userid 118)
	id A11F2E00935; Tue,  7 Feb 2017 06:00:48 -0800 (PST)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
	yocto-www.yoctoproject.org
X-Spam-Level: 
X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED
	autolearn=ham version=3.3.1
X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%
	*      [score: 0.0000]
	* -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,
	*      medium trust
	*      [147.11.1.11 listed in list.dnswl.org]
Received: from mail.windriver.com (mail.windriver.com [147.11.1.11])
	by yocto-www.yoctoproject.org (Postfix) with ESMTP id 49FC7E0083C
	for <yocto@yoctoproject.org>; Tue,  7 Feb 2017 06:00:46 -0800 (PST)
Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com
	[147.11.189.40])
	by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id v17E0gYc011897
	(version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL);
	Tue, 7 Feb 2017 06:00:42 -0800 (PST)
Received: from [128.224.56.214] (128.224.56.214) by ALA-HCA.corp.ad.wrs.com
	(147.11.189.50) with Microsoft SMTP Server id 14.3.294.0;
	Tue, 7 Feb 2017 06:00:41 -0800
To: David Vincent <freesilicon@gmail.com>, Yocto Project Discussion
	<yocto@yoctoproject.org>
References: <20170125103759.15880-1-freesilicon@gmail.com>
	<1710687.9RfHKcS4U3@crde-port-20.cahors.local>
	<503ef641-856e-a831-d39e-2c33b3b2440d@windriver.com>
	<2822590.mQdJjHCjeH@crde-port-20.cahors.local>
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Message-ID: <186bf3c4-a317-34f5-7f6d-cc0e8ae2f233@windriver.com>
Date: Tue, 7 Feb 2017 09:00:41 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
	Thunderbird/45.7.0
MIME-Version: 1.0
In-Reply-To: <2822590.mQdJjHCjeH@crde-port-20.cahors.local>
Subject: Re: [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches
X-BeenThere: yocto@yoctoproject.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Discussion of all things Yocto Project <yocto.yoctoproject.org>
List-Unsubscribe: <https://lists.yoctoproject.org/options/yocto>,
	<mailto:yocto-request@yoctoproject.org?subject=unsubscribe>
List-Archive: <http://lists.yoctoproject.org/pipermail/yocto>
List-Post: <mailto:yocto@yoctoproject.org>
List-Help: <mailto:yocto-request@yoctoproject.org?subject=help>
List-Subscribe: <https://lists.yoctoproject.org/listinfo/yocto>,
	<mailto:yocto-request@yoctoproject.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Feb 2017 14:00:48 -0000
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 8bit

On 2017-02-07 06:21 AM, David Vincent wrote:
> On vendredi 3 février 2017 13:51:34 CET Bruce Ashfield wrote:
>>
>> I was able to merge branches with this patch applied to Morty.
>>
>> Cheers,
>>
>> Bruce
>>
> I've just successfully tested it on Morty myself. Works for me too, branches
> are merged just like they were before !

Good news!

I'll send the patch to the morty maintainer so it can be merged.

Cheers,

Bruce

>
> Thank you
> David
>
>