Re: A failing attempt to use Git in a centralized environment

From: John Szakmeister <john@szakmeister.net>
Date: May 4, 2014, 08:58 UTC
Message-ID: <CAEBDL5XZGz3uRAhnvtPmjWH0i=MLz08MkEGvJVRfj2MLunq++Q@mail.gmail.com>
In-Reply-To: <5BA0AC67-CDD6-4725-B75D-B98F957EB51E@mac.com>

On Wed, Apr 30, 2014 at 1:15 PM, Geert Bosch <boschg@mac.com> wrote:

Show 12 quoted lines

>
> On Apr 28, 2014, at 02:29, Marat Radchenko <marat@slonopotamus.org> wrote:
>
>> In short:
>> 1. Hack, hack, hack
>> 2. Commit
>> 3. Push, woops, reject (non-ff)
>> 4. Pull
>> 5. Push
>
> Just do pull --rebase? This is essentially the same as what SVN
> used to do in your setup.

That's not necessarily a good solution either. For teams that don't use rebase, it can leave them with their newly committed stuff now rebased on the work from upstream--duplicating commits without understanding why and where they came from, especially if other branches were built on top of that one.

I agree in concept, but in practice it can be quite confusing. :-(

-John