From: Geert Bosch <boschg@mac.com>
Date: Wed, 30 Apr 2014 17:15:30 GMT
Subject: Re: A failing attempt to use Git in a centralized environment
Message-ID: <5BA0AC67-CDD6-4725-B75D-B98F957EB51E@mac.com>
In-Reply-To: <4ay6w9i74cygt6ii1b0db7wg.1398433713382@email.android.com>


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.

  -Geert