Tomáš Janoušek on Nostr: npub1upkp7…4tcwy I'm not super familiar with the details but having known git for a ...

npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) I'm not super familiar with the details but having known git for a long time, I think it's probably a mistake to think the word "merge" in the implementation means the same thing as the user-facing "merge". In particular, merge strategies (which is probably what's being used here) is what a normal human would describe as a 3-way patch application. So yeah, just a reverse commit, but with some additional smartness taking history into account so that less conflicts needs manual resolution.