On 4/25/07, Yakov Lerner <iler.ml@gmail.com> wrote:
quoted text
> 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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html