From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 25 Apr 2007 10:40:24 GMT
Subject: Re: basic question
Message-ID: <81b0412b0704250340n555d4398i9288255562be78ba@mail.gmail.com>
In-Reply-To: <f36b08ee0704250234u5ee4557au22fefa637d25aef0@mail.gmail.com>

On 4/25/07, Yakov Lerner <iler.ml@gmail.com> wrote:
> I have bare repo X, and two clones A and B (basically my work copy and
> home copy of same personal files. I use 'git-pull origin' and 'git
> push origin master' to sync files).
>
> The same file 'xxx' was modified on A and on B, and committed on both.
> In A, trying now 'git-pull origin', I get 'xxx: needs update'.
> Which commands do I use now to merge xxx on A ?
>

You have _not_ committed the file xxx in A.

git commit -a
git pull B