16 Nov
2012
16 Nov
'12
9:58 p.m.
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.