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

Lost changes after merge

From
Gray King <grayking.w@gmail.com>
Date
Oct 29, 2018, 08:49 UTC
Message-ID
<CAP1N1j7P83XVPx6dDGMSeRbwjdixAdBNZab=TP94=9LSfmsrRQ@mail.gmail.com>
Hello,
  I have a very strange issue described below:
* Here is the tree before I merge via `git log --format="%h %p %d" -n
20 --all --graph`:
https://upaste.de/9Pe
* Here is the output of `git log --format="%h %p %d" -2 path/to/file`:

a008c4d580 c61f96eb5d a274b6e7ca 67c1000ca3

* Here is the merge commands:

git merge f087081868 # fix conflicts

* Here is the tree after I merged via `git log --format="%h %p %d" -n
20 --all --graph`:
https://upaste.de/8Bx
* Here is the output of `git log --format="%h %p %d" -2 path/to/file`:

a274b6e7ca 67c1000ca3 67c1000ca3 00bd5c8c89

Next: Gray King
Message 1 of 6 in “Lost changes after merge”
  1. Gray KingOct 29, 2018
  2. Gray KingOct 29, 2018
  3. Jeff KingOct 29, 2018
  4. Gray KingOct 30, 2018
  5. Rafael AscensãoOct 30, 2018
  6. Brandon McCaigOct 31, 2018

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.