2026-09-07 14:47 UTC
@b0rk@social.jvns.ca it's just an awful situation. i keep thinking "does HEAD indicate the change i am attempting to apply, unnamed because it's as-yet uncommitted, or is it just the state of some tree whose name I don't care about"
Replies (2)
-
@b0rk@social.jvns.ca 2026-09-07 14:56
@wingo@mastodon.social i'm trying to think about what Git's official documentation should say about this situation other than "idk it sucks" haha
-
@palmer@social.kernel.org 2026-09-07 14:58
@wingo@mastodon.social @b0rk@social.jvns.ca I've found that by merge conflict time it's usually too late to really understand what's going on, it's just one of the pitfalls of the whole content tracker model git uses. I have better luck going back to the commits that touched the code, treating them as patches, and then logically re-applying them into the merge commit.