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

Problem with rerere forget

From
ACAlex Coppens <alex@nativetouch.com>
Date
May 14, 2015, 18:05 UTC
Message-ID
<CAPt1q6fMMz61aZEJB9b+K6+kHFwkm+bMYXoKBj78GNJU+dWioA@mail.gmail.com>
Hello there,

So I am trying to make git forget a conflict resolution: _______________

git rerere forget path_to_file/file.js
fatal: BUG: attempt to commit unlocked object
_______________
Google doesn't seem to know the answer: No results found for "fatal:
BUG: attempt to commit unlocked object".
I think I am using rerere forget the wrong way. Can someone help?
Regards,
Alex
Next: Stefan Beller
Message 1 of 13 in “Problem with rerere forget”
  1. Alex CoppensMay 14, 2015
  2. Stefan BellerMay 14, 2015
  3. Alex CoppensMay 14, 2015
  4. Stefan BellerMay 14, 2015
  5. Junio C HamanoMay 14, 2015
  6. Jeff KingMay 14, 2015
  7. Junio C HamanoMay 14, 2015
  8. rerere: exit silently on "forget" when rerere is disabledJeff King, May 14, 2015
  9. Junio C HamanoMay 14, 2015
  10. Jeff KingMay 14, 2015
  11. Alex CoppensMay 14, 2015
  12. Jeff KingMay 14, 2015
  13. Alex CoppensMay 14, 2015

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.