From: Mike Hommey <mh@glandium.org>
Date: Fri, 08 Feb 2008 22:27:22 GMT
Subject: Re: Minor annoyance with git push
Message-ID: <20080208222722.GA24474@glandium.org>
In-Reply-To: <46a038f90802081423v13a19a65oe842b94ba7f85528@mail.gmail.com>

On Sat, Feb 09, 2008 at 11:23:30AM +1300, Martin Langhoff wrote:
> 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...

Even with merges, it could be helpful to have a tool that would
automagically stash, checkout the appropriate branch, merge (and deal
with conflicts if necessary), and so on.

Mike