From: tactical <a5158017@nepwk.com>
Date: Sat, 24 Sep 2011 22:17:35 GMT
Subject: Re: More Beginning Git Questions
Message-ID: <1m2c90ds9e46c.7agk88pbgjl8$.dlg@40tude.net>
In-Reply-To: <op.v2byz2p80aolir@keputer.lokaal>

Frans Klaver wrote:

>> Mercurial allows this, and it's a very powerful feature.  After reading
>> this thread, I could not believe Git didn't pulling with local changes,  
>> and so I tried it, and also asked on IRC -- and it seems that Git really
>> doesn't.
> 
> Git doesn't do it implicitly. Be explicit about it
> 
> $ git stash
> $ git pull
> $ git stash pop
> 
> seems to do exactly what you want.

Does popping the stash allow for a three-way merge?  If not, this doesn't
really solve the problem.

Thanks