{"thread":{"id":"7830","subject":"basic question","startedAt":"2007-04-25T09:34:00Z","lastAt":"2007-04-25T10:40:24Z","messageCount":2,"participants":["Yakov Lerner","Alex Riesen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"40392","messageId":"f36b08ee0704250234u5ee4557au22fefa637d25aef0@mail.gmail.com","threadId":"7830","inReplyTo":null,"subject":"basic question","fromName":"Yakov Lerner","fromEmail":"iler.ml@gmail.com","sentAt":"2007-04-25T09:34:00Z","receivedAt":"2007-04-25T09:34:00Z","isPatch":false,"sender":{"key":"iler.ml@gmail.com","avatar":null},"body":"I have bare repo X, and two clones A and B (basically my work copy and\nhome copy of same personal files. I use 'git-pull origin' and 'git\npush origin master' to sync files).\n\nThe same file 'xxx' was modified on A and on B, and committed on both.\nIn A, trying now 'git-pull origin', I get 'xxx: needs update'.\nWhich commands do I use now to merge xxx on A ?\n\nThanks\nYakov\n"},{"id":"40395","messageId":"81b0412b0704250340n555d4398i9288255562be78ba@mail.gmail.com","threadId":"7830","inReplyTo":"f36b08ee0704250234u5ee4557au22fefa637d25aef0@mail.gmail.com","subject":"Re: basic question","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-04-25T10:40:24Z","receivedAt":"2007-04-25T10:40:24Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 4/25/07, Yakov Lerner <iler.ml@gmail.com> wrote:\n> I have bare repo X, and two clones A and B (basically my work copy and\n> home copy of same personal files. I use 'git-pull origin' and 'git\n> push origin master' to sync files).\n>\n> The same file 'xxx' was modified on A and on B, and committed on both.\n> In A, trying now 'git-pull origin', I get 'xxx: needs update'.\n> Which commands do I use now to merge xxx on A ?\n>\n\nYou have _not_ committed the file xxx in A.\n\ngit commit -a\ngit pull B\n"}]}