From: tactical Date: Sat, 24 Sep 2011 20:22:31 GMT Subject: Re: More Beginning Git Questions Message-ID: <14gm3o851q0ad.1uoossmxgfyit.dlg@40tude.net> In-Reply-To: <4E7CCCA0.50909@gmail.com> Jon Forrest wrote: >> Generally Alice shouldn't have uncommitted changes when doing >> "git pull". > > That's what the tutorial said but I'm trying to understand > what happens if she does have uncommitted changes. I'm > trying to understand the total picture. 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. If this is an important part of your workflow (as it is mine), I'd recommend using Mercurial if possible.