Re: Branching workflow

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 25, 2014, 05:15 UTC
Message-ID: <xmqqsijgb7qq.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CALZVapmm3=zgx4xZegieSxiUOcYcz9DMHVFknA8SeeYwO5fVJQ@mail.gmail.com>

Javier Domingo Cansino <javierdo1@gmail.com> writes:

Show 10 quoted lines

> I would like to seek for a little more advice. I keep rebasing all my
> work each time master branch is updated, and I would like to know if
> this is usually done or not.
>
> The workflow is not using emails, but each developer has his clone
> where he works, and occasionally sends work to the gerrit tool we use,
> upgrading the patch with each master update.
>
> I know this is a crazy workflow, and I would like to know when you
> usually consider to update the sent patch with a rebase.

When a rerolled set of patches come, I try to apply them to the same commit as the previous fork point. When there is no reroll, there is no reason to ever do any rebase myself.

The trial integration branch 'pu' is rebuilt from scratch every day, starting from the tip of 'master' and merging all the topics that have not been merged to 'master'.

By not doing unnecessary rebase, we won't risk breaking each topic. By merging topics together to updated 'master', we make sure changes done in other topics do not negatively affect each topic.