From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Fri, 08 Feb 2008 22:23:30 GMT
Subject: Re: Minor annoyance with git push
Message-ID: <46a038f90802081423v13a19a65oe842b94ba7f85528@mail.gmail.com>
In-Reply-To: <alpine.LSU.1.00.0802081151170.11591@racer.site>

On Feb 9, 2008 12:52 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> That question comes up pretty often, I think.  But you need a working
> directory to resolve conflicts for merges.  You only have one, though.

Once all the remote refs are fetched, it is trivial to determine that
it is just a fast-forward, therefore _no_ merge and no chance for
conflicts...

cheers,


m