From: Jing Xue <jingxue@digizenstudio.com>
Date: Sat, 25 Aug 2007 11:53:26 GMT
Subject: Re: how do you "force a pull"?
Message-ID: <20070825115326.GB7122@falcon.digizenstudio.com>
In-Reply-To: <20070825113747.GA21030@mimvista.com>

On Sat, Aug 25, 2007 at 07:37:47AM -0400, David Watson wrote:
> $ git reset --hard origin/master

Ah, this is what I was looking for. Not very intuitive, but works like a
charm!

> You may be getting the "cannot merge message" if you have uncommitted
> changes, as git won't let you merge when the working copy is changed.
> git-pull is really git-fetch + git-merge.

Right, because I used "--soft" in the earlier reset.

Thanks!
-- 
Jing Xue