Julia Evans on Nostr: trying to make a diagram explaining the different way git uses the word "merge" in ...
trying to make a diagram explaining the different way git uses the word "merge" in its terminology and uh it's a mess
(not looking for suggestions thanks!)
Published at
2024-03-18 19:51:38Event JSON
{
"id": "57c9f7c2554c3d86d8f9c0671732f973f8b2d84c135487a19be142a7f1a2982f",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1710791498,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/112118431625867287",
"activitypub"
]
],
"content": "trying to make a diagram explaining the different way git uses the word \"merge\" in its terminology and uh it's a mess \n\n(not looking for suggestions thanks!)\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/112/118/431/246/808/712/original/0d8291ab4defcfd4.png",
"sig": "58a12318eb00008d8c04ea9a1f906c2894fd283ee0332250a7aae57228e385a00017a6ab5679a186523c0df962398f2685847a426d0208a3ad1d506224e90890"
}