From: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Date: Wed, 07 Nov 2007 07:06:46 GMT
Subject: Re: git pull opinion
Message-ID: <20071107070646.GA3417@informatik.uni-freiburg.de>
In-Reply-To: <4730AD48.2050907@obry.net>

Hello,

> I'm using:
> 
> $ git config --global alias.update '!git stash && git pull && git stash apply'
I wonder how this works, if the merge produces conflicts...

Best regards
Uwe

-- 
Uwe Kleine-König

http://www.google.com/search?q=1+year+in+days