Julia Evans on Nostr: does anyone have tips for how to make sense of git merge histories like this? do you ...
does anyone have tips for how to make sense of git merge histories like this? do you use `git log --first-parent`? something else? how can you tell if commit A was merged before or after commit B? what if there are "backwards" merges like in the 3rd screenshot?
(no "just make the history linear” or "merges are bad" takes please)
Published at
2023-12-15 15:11:59Event JSON
{
"id": "fb29763fb359219d5f7e01ec0a1d9d9a5c2afe43b94fcd7ac024bcd2bb4c688d",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1702653119,
"kind": 1,
"tags": [
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111585074868525422",
"activitypub"
]
],
"content": "does anyone have tips for how to make sense of git merge histories like this? do you use `git log --first-parent`? something else? how can you tell if commit A was merged before or after commit B? what if there are \"backwards\" merges like in the 3rd screenshot?\n\n(no \"just make the history linear” or \"merges are bad\" takes please)\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/111/585/074/274/231/873/original/33bdc81380275be5.png\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/111/585/074/494/376/746/original/d4404293f8875e95.png\n\nhttps://cdn.masto.host/socialjvnsca/media_attachments/files/111/585/074/577/614/979/original/25cce39d474241de.png",
"sig": "fa04781fac12a3677267a895b09f7b8f5a550f79047b74f2c38b1792f0ed1176dac840ac33d5e9a8d52bf553201865ff6dd38b99feb1d9fbabdff84251ed3603"
}