2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Yakov Lerner <hidden>
Date: 2016-06-15 22:43:06
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
From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:06
On 4/25/07, Yakov Lerner [off-list ref] 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