threads / discuss / 7830

basic question

Subject: basic question

## tl;dr

2 messages between Apr 25, 2007 and Apr 25, 2007.

replies: 1people: 2as markdown or json

Yakov Lerner· Apr 25, 2007, 09:34 UTC · lore

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 ?

Thanks Yakov

Alex Riesen· Apr 25, 2007, 10:40 UTC · re: Yakov Lerner · lore

Re: basic question

On 4/25/07, Yakov Lerner <iler.ml@gmail.com> wrote:

Show 8 quoted lines

> 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