Re: Amending merge commits?

From: Nico Williams <nico@cryptonector.com>
Date: Jul 29, 2014, 20:19 UTC
Message-ID: <CAK3OfOgZt55+tKv5455Jk-F=buULtftmCasbxHYcxGzppbWcfg@mail.gmail.com>
In-Reply-To: <DFE66A48CBC646E795B3B4A0903AB19E@PhilipOakley>

On Tue, Jul 29, 2014 at 2:29 PM, Philip Oakley <philipoakley@iee.org> wrote:

Show 14 quoted lines

> From: "Nico Williams" <nico@cryptonector.com>
>> Local merge commits mean that you either didn't rebase to keep all
>> your local commits on top of the upstream, or that you have multiple
>> upstreams (the example exception I gave).
>>
>> Conversely, if you always rebase your local commits on top of the
>> upstream then you won't have merge commits to worry about.
>>
> Whilst it may not be "the Git Way", I'd expect that in many less well
> informed companies, the need to keep merge commits fom other lines of
> development would be quite a common (political ) technique where some
> preparatory branch needs to be merged in before one's feature can be
> completed (similar to all those cases on the list when folk say 'builds on
> top of xy's commit deadbeaf)

The way we did this at Sun, first with Teamware, then later with Mercurial, was as follows:

 - "projects" kept their own clone repos of the upstream
 - engineers working on a project cloned the project repo ("project gate")
 - engineers pushed/pulled to/from the project gate
 - each project gate had a gatekeeper whose job it was to periodically
rebase onto the latest upstream
 - then engineers would rebase onto the new project gate

No "merge turds" (Sun speak) were ever allowed in any upstream, whether a project gate or the ultimate upstream. All commits had to be organized according to specific rules, and squashed. These rules applied at the project gate and in the upstream.

 - when the project was ready for integration the gatekeeper would
rebase and squash as necessary, then push to the upstream

(I'm eliding some details. In particular when an intermediate upstream rebased the previous head was left available as a "snapshot" to make the equivalent of git rebase --onto possible.)

The upshot was: all local commits were always on top of whatever the next upstream in the chain was. Always. No merge commits ever.

That workflow works just fine with git. It worked really well at Sun (with thousands of engineers working on Solaris alone). And it should work well for anyone who doesn't have two or more forked upstreams to follow.

Nico --