# basic question 2 messages from 2007-04-25 to 2007-04-25. Participants: Yakov Lerner, Alex Riesen. Thread: https://gitlist.dev/t/7830 ## Yakov Lerner, 2007-04-25 09:34 Subject: basic question Message-ID: URL: https://gitlist.dev/e/f36b08ee0704250234u5ee4557au22fefa637d25aef0%40mail.gmail.com ``` 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, 2007-04-25 10:40 Subject: Re: basic question Message-ID: <81b0412b0704250340n555d4398i9288255562be78ba@mail.gmail.com> URL: https://gitlist.dev/e/81b0412b0704250340n555d4398i9288255562be78ba%40mail.gmail.com In-Reply-To: ``` On 4/25/07, Yakov Lerner 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 ```