Re: How to pre-empt git pull merge error?

From: Konstantin Khomoutov <flatworm@users.sourceforge.net>
Date: Nov 27, 2013, 15:42 UTC
Message-ID: <20131127194240.2abaff5575961b3d73e1970f@domain007.com>
In-Reply-To: <86d2llc1rs.fsf@gmail.com>

On Wed, 27 Nov 2013 15:17:27 +0000 Pete Forman <petef4+usenet@gmail.com> wrote:

Show 19 quoted lines

> I am looking for a way of detecting up front whether a git pull or git
> merge would fail. The sort of script I want to perform is to update a
> server.
> 
>     git fetch
>     git okay
>     stop server
>     backup data
>     git merge
>     start server
> 
> Here git okay is a place holder for the command I am asking for.
> 
> If a file has been changed outside of a commit then git pull fails
> with the following error.
> 
> error: Your local changes to '...' would be overwritten by merge.
> Aborting. Please, commit your changes or stash them before you can
> merge.

What's wrong with "git okay" being

if git merge whatever 2>/dev/null; then
  ... OK path
else
  ... "merge failed" path
fi