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

Re: Problem with two copies of same branch diverging

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 4, 2016, 17:57 UTC
Message-ID
<CAPc5daU7cyUNYOPbg1cYrkvCzYZ9xCsx4MhSZRHaeoXy9Ltcrg@mail.gmail.com>
In-Reply-To
<36ecaea6-5f09-25fd-ffa7-61bdaf91414d@greenberg.org>
On Thu, Aug 4, 2016 at 10:50 AM, Ed Greenberg <edg@greenberg.org> wrote:
Show 10 quoted lines
> On 08/04/2016 01:28 PM, Junio C Hamano wrote:
>>
>> ... indicates that you are not pushing to update the remote
>> repository correctly.  Once you get that part working correctly,
>> after you push at the end of the session, you should be able to do
>> "git reset" at the other side to tell Git to notice that the updated
>> working tree files that were transferred behind its back are now in
>> sync with what is supposed to be checked out.
>
> If this is the case, why do my fresh clones contain the most recent commit?

Exactly. Why does your "push" not result in "git log" to show the most recent commit? Once you solve that, "git reset" would do the right thing, I would think, just like a fresh clone shows the latest. The thing is, that I didn't quite find out what your "push" is doing wrong in your original message.

Previous: Junio C Hamano
Message 3 of 3 in “Problem with two copies of same branch diverging”
  1. Ed GreenbergAug 4, 2016
  2. Junio C HamanoAug 4, 2016
  3. Junio C HamanoAug 4, 2016

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.