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

Re: git pull bug report

From
Bagas Sanjaya <bagasdotme@gmail.com>
Date
Nov 15, 2021, 09:12 UTC
Message-ID
<0bd032c1-f90b-1892-693c-518a01b3b671@gmail.com>
In-Reply-To
<CADL96rvWidDUEChJX8JCruUKjaOWqXrZn6-sG0EYb82_k_LTsA@mail.gmail.com>
On 15/11/21 15.56, Erwin Villejo wrote:
> There is nothing to reconcile since the branches have not diverged:
> local is ahead of upstream. So I think it is a bug, no?
You have the situation like:
---o---a (your mainline)
    \
     b---c---d (remote mainline)

Your mainline only have one commit ahead of base point `o`, while the remote mainline have three commits ahead of `o` but unrelated. In this sense, your and remote mainline is divergent - you need to either merge or rebase.

Next time, keep your mainline pristine (don't commit any local changes on it, instead branch to the topic branch and commit there).

-- 
An old man doll... just what I always wanted! - Clara
Previous: Erwin VillejoNext: Erwin Villejo
Message 4 of 11 in “git pull bug report”
  1. Erwin VillejoNov 15, 2021
  2. Bagas SanjayaNov 15, 2021
  3. Erwin VillejoNov 15, 2021
  4. Bagas SanjayaNov 15, 2021
  5. Erwin VillejoNov 15, 2021
  6. Erwin VillejoNov 15, 2021
  7. Bryan TurnerNov 15, 2021
  8. Erwin VillejoNov 15, 2021
  9. Junio C HamanoNov 15, 2021
  10. Bryan TurnerNov 15, 2021
  11. Erwin VillejoNov 16, 2021

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.