Julia Evans on Nostr: how git cherry-pick and revert use 3-way merge ...
Published at
2023-11-10 18:24:31Event JSON
{
"id": "9c054df0754fed6c2c979dfa1addac1e66e7f5621e3c1756f4b4adc33b29dbcb",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1699640671,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111387651024501801",
"activitypub"
]
],
"content": "how git cherry-pick and revert use 3-way merge https://jvns.ca/blog/2023/11/10/how-cherry-pick-and-revert-work/",
"sig": "984ecee489845490a894d7cd7970beca1474173fd597c0c33d3717709b782a1ae4be98677686118c36d96139f6a10a02fd71f87d192d8d037cf763c7a831288f"
}