From: Steffen Prohaska <prohaska@zib.de>
Date: Wed, 24 Oct 2007 20:12:29 GMT
Subject: Re: best git practices, was Re: Git User's Survey 2007 unfinished summary continued
Message-ID: <86784BB7-076F-4504-BCE6-4580A7C68AAC@zib.de>
In-Reply-To: <20071024194849.GH29830@fieldses.org>

On Oct 24, 2007, at 9:48 PM, J. Bruce Fields wrote:

>
>> I want git pull to work like git push.
>
> That strikes me as a less complete solution, since it only helps in  
> the
> case where the other branches all happen to be unmodified locally  
> (hence
> can be fast-forwarded).  In other cases the "git push" will still  
> emit a
> spurious error.

Well, but then there's something you should really think
about. Then you _have_ local changes that are not at the remote.
You need to handle them somehow. Maybe you forgot to push
earlier and now the remote advanced.

Btw, the 'new' git pull should already have reported a warning
that it failed to fast forward the local branch. git pull
should have suggested to explicitly merge the branch with
local changes.

	Steffen