From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 16 Nov 2012 21:58:48 +0100
Subject: [U-Boot] please pull u-boot-samsung master
In-Reply-To: <50A5DFFA.8000004@samsung.com>
References: <50A4DC44.1060609@samsung.com> <20121116005049.51e721a2@lilith>
	<50A5DFFA.8000004@samsung.com>
Message-ID: <20121116215848.2172a156@lilith>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Minkyu,

On Fri, 16 Nov 2012 15:40:58 +0900, Minkyu Kang <mk7.kang@samsung.com>
wrote:

> On 16/11/12 08:50, Albert ARIBAUD wrote:
> > Hi Minkyu,

> > (Was your master branch rebased?)
> 
> Yes.
> Is it not recommended?

The wiki may still be lagging behind but it has been discussed here and
master branches should never be rebased, they should merge. Merges can
fast-forward, though, if possible. The idea is that custodian master
branches should be fairly autonomous projects, synchronizing to/from
upstream as required, but not rebasing. 'Next' branches should try to
follow this too, although rebasing a 'next' is allowed.

> Thanks.
> Minkyu Kang.

Amicalement,
-- 
Albert.