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

Re: commit gone after merge - how to debug?

From
ILIgor Lautar <igor.lautar@gmail.com>
Date
Nov 26, 2012, 17:01 UTC
Message-ID
<CAO1Khk9oNoCpAmWaEfew1K976B+8bn+R6XMi3vGtH-Vj3TJMqg@mail.gmail.com>
In-Reply-To
<vpqa9u4pgew.fsf@grenoble-inp.fr>

On Mon, Nov 26, 2012 at 3:50 PM, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> wrote:

> What's possible is that someone had already merged the branch containing
> "new", got conflicts, and resolved it in favor of "old" somewhere in the
> history of your master branch.

This is exactly what happened. I've actually found a merge of origin to mirror which reversed the change some time back and was subsequently merged back to origin later on. Most probably human error during merge.

Interestingly, this was my first thought as well, but I've must have overlooked that particular merge the first time.

Anyhow, it sorted now, many thanks for your help, Igor

Previous: Matthieu MoyNext: Igor Lautar
Message 12 of 13 in “commit gone after merge - how to debug?”
  1. Igor LautarNov 26, 2012
  2. Tomas CarneckyNov 26, 2012
  3. Matthieu MoyNov 26, 2012
  4. Igor LautarNov 26, 2012
  5. Matthieu MoyNov 26, 2012
  6. Igor LautarNov 26, 2012
  7. Matthieu MoyNov 26, 2012
  8. Igor LautarNov 26, 2012
  9. Matthieu MoyNov 26, 2012
  10. Igor LautarNov 26, 2012
  11. Matthieu MoyNov 26, 2012
  12. Igor LautarNov 26, 2012
  13. Igor LautarNov 26, 2012

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.