Sun on Nostr: whty is --ours and --theirs so fucking confusing in git
whty is --ours and --theirs so fucking confusing in git
Sun /
npub1qh0…xeda
2025-03-15 17:44:12
Author Public Key
npub1qh097tfm3kv0nwffd9ggptn255d3fuqdcy3wauw5p4gz5z45s92qc3xedaSeen on
wss://relay.mostr.pubPublished at
2025-03-15 17:44:12Event JSON
{
"id": "d569b2bba43df4cf35c3533665f8cc4ceb17ee0e949b5a1c99929159ac1db8eb",
"pubkey": "05de5f2d3b8d98f9b929695080ae6aa51b14f00dc122eef1d40d502a0ab48154",
"created_at": 1742060652,
"kind": 1,
"tags": [
[
"zap",
"05de5f2d3b8d98f9b929695080ae6aa51b14f00dc122eef1d40d502a0ab48154",
"wss://relay.mostr.pub",
"0.915"
],
[
"zap",
"6be38f8c63df7dbf84db7ec4a6e6fbbd8d19dca3b980efad18585c46f04b26f9",
"wss://relay.mostr.pub",
"0.085"
],
[
"proxy",
"https://shitposter.world/objects/f1a34be1-06cc-4570-a603-50876c1e3415",
"activitypub"
]
],
"content": "whty is --ours and --theirs so fucking confusing in git",
"sig": "5fdf1a837ad5c3028ce32d36331d2d1b17ab98938f794505790b8044f9b409bc5dd4d5f0dc5ffd77b568cf85d65c2e8840a18690254136be5ef332bdc02f06e1"
}