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

Re: How to fix “Your branch and 'origin/master' have diverged” after editing a commit that came before a pull?

From
Yang Zhang <yanghatespam@gmail.com>
Date
Nov 20, 2010, 01:59 UTC
Message-ID
<AANLkTinRfzzG-Dc9Ervc-h0_4cwx9KBO1aTkhwBGpHHs@mail.gmail.com>
In-Reply-To
<AANLkTikr+uGrO2EB9WQk+CXeOm7jiYxdbhGzRRvgc9B9@mail.gmail.com>
Clarification:

Simply pulling again does not fix the problem; it just reapplies the commits D, E on top of what I already have (despite the D, E already being there in the history), which also has the side-effect of producing superfluous conflicts.

On Fri, Nov 19, 2010 at 4:36 PM, Yang Zhang <yanghatespam@gmail.com> wrote:
Show 14 quoted lines
> In the following scenario:
>
> 1. Make commits A, B, C
> 2. Pull, getting commits D, E
> 3. Make more commits F, G, H, ...
> 4. Realize that you need to tweak B
> 5. Tweak B using git rebase -i and git commit --amend
>
> Now git status says:
>
>  Your branch and 'origin/master' have diverged.
>
> How should I fix this? Thanks.
>
-- 
Yang Zhang
http://yz.mit.edu/
Previous: Yang ZhangNext: Jeff King
Message 2 of 8 in “How to fix “Your branch and 'origin/master' have diverged” after editing a commit that came before a pull?”
  1. Yang ZhangNov 20, 2010
  2. Yang ZhangNov 20, 2010
  3. Jeff KingNov 20, 2010
  4. Yang ZhangNov 20, 2010
  5. Gavin GuoNov 21, 2010
  6. Jeff KingNov 21, 2010
  7. Yang ZhangNov 21, 2010
  8. Jeff KingNov 22, 2010

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.