What is Nostr?
Danny Whitt /
npub1c4h…76yt
2024-03-11 14:24:15
in reply to nevent1q…rwz7

Danny Whitt on Nostr: npub1upkp7…4tcwy Without considering other aspects, it seems that one always wants ...

npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) Without considering other aspects, it seems that one always wants to take the second (>>>>>>>) change as this represents local changes. Why, with the exception of maybe another (recent) commit on the remote on the exact same line(s) of code would one want to discard our changes?
Author Public Key
npub1c4hsjzhzyspj3fu5wsj4mj6emt5f0hl2wehwsd2usjxepa986v7skl76yt