git/list[1] front-page[2] threads[3] people[4] search[5] about
 

basic question

From
YLYakov Lerner <iler.ml@gmail.com>
Date
Apr 25, 2007, 09:34 UTC
Message-ID
<f36b08ee0704250234u5ee4557au22fefa637d25aef0@mail.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

Next: Alex Riesen
Message 1 of 2 in “basic question”
  1. Yakov LernerApr 25, 2007
  2. Alex RiesenApr 25, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.