What is Nostr?
Paul Cantrell /
npub1wd5…u3nk
2024-03-11 13:24:34
in reply to nevent1q…rwz7

Paul Cantrell on Nostr: npub1upkp7…4tcwy I usually end up inspecting history with a GUI. (I like gitup.co ...

npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy)
I usually end up inspecting history with a GUI. (I like gitup.co for these sorts of task.)

This is a situation where GitHub fails extra hard, imo. It seems to me other version control systems somehow aren’t as confusing about how they show the conflict.
Author Public Key
npub1wd5vff3dsq0nf3yde85fn4g3qeaagwuacxw222j35f6q6r6lvttsyeu3nk