Billy on Nostr: Adolph if you're rebasing multiple commits with conflicts, git will remember how you ...
Adolph (nprofile…5k85) if you're rebasing multiple commits with conflicts, git will remember how you solved the conflicts the first time and automatically reapply the fix
Published at
2025-03-10 11:50:11Event JSON
{
"id": "22198ede191644222c649072240ef4048eb1be45bce75323383bac962981a4eb",
"pubkey": "bd7ad4a38f7d2738d935b0a302ece77da78978728fcb6a331994b6ee5dda2fd8",
"created_at": 1741607411,
"kind": 1,
"tags": [
[
"p",
"f66e66bb2d91ad65b0b904021f7ef0a3dcab37f1c005a8fedd820a7f7d932762",
"wss://relay.mostr.pub"
],
[
"e",
"036bd6071dc36d00e3a85fcfd9f7814735fa87388681591f9c2f6b9f37c3a410",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://fosstodon.org/users/billy/statuses/114137983330697261",
"activitypub"
]
],
"content": "nostr:nprofile1qy2hwumn8ghj7un9d3shjtnddaehgu3wwp6kyqpq7ehxdwedjxkktv9eqspp7lhs50w2kdl3cqz63lkasg987lvnya3qa85k85 if you're rebasing multiple commits with conflicts, git will remember how you solved the conflicts the first time and automatically reapply the fix",
"sig": "29615ae086c24be1b1072998f789d9a26ca4bd59f663ff7ff24d215f4eca643bdf0e76e2904633f8e452f2f17fb6b3762b0fd5377fd12bdf57c78e144d71b230"
}
