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

Re: basic question

From
Alex Riesen <raa.lkml@gmail.com>
Date
Apr 25, 2007, 10:40 UTC
Message-ID
<81b0412b0704250340n555d4398i9288255562be78ba@mail.gmail.com>
In-Reply-To
<f36b08ee0704250234u5ee4557au22fefa637d25aef0@mail.gmail.com>
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

Previous: Yakov Lerner
Message 2 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.