On Sun, Nov 3, 2024, at 02:25, Marco Stephan wrote: > This consistently produces the error "error: Entry 'test.txt' not > uptodate. Cannot merge.". I would expect step 14 to work regardless of > how the repository directory itself has been created. Running "git > status" or "git update --really-refresh" fixes the seemingly corrupt > data and the revert in progress can be aborted. Okay, I missed that `git update-index --really-refresh` previously. I’m not a technical expert but is there a use-case here? Or did you find this by accident while doing something else? -- Kristoffer Haugsbakk
