some confusions folks have mentioned with merge commits so far are:
- they make git bisect more confusing
- unclear how to revert them (you need to `git revert -m 1 COMMIT_ID` or something)
- merges can introduce bugs by accident, even if the code merges cleanly
- they take up space and make it harder to scan for information about the actual code changes
- "backwards" merges make the graph confusing
- it's harder to scan the history by time to identify a recent problem commit
(3/?)
Julia Evans /
npub1ym…nlm9y
2023-12-14 23:05:08
in reply to nevent1q…tpj4
Author Public Key
npub1ym9ddu2qh7rda8pxklq4gxw2kxhtm4cgvdvdy64z6agwy88nhuhqcnlm9yPublished at
2023-12-14 23:05:08Event JSON
{
"id": "0a50e13e3c527140cbc1db385f59580f8213dcacbc8a14aa99f00f1aa1beed99",
"pubkey": "26cad6f140bf86de9c26b7c15419cab1aebdd7086358d26aa2d750e21cf3bf2e",
"created_at": 1702595108,
"kind": 1,
"tags": [
[
"e",
"e0611a448a07e8f18e1347186939823c333ae26871c0b64d1dcfdbf45127195b",
"wss://relay.mostr.pub",
"reply"
],
[
"proxy",
"https://social.jvns.ca/users/b0rk/statuses/111581273046514062",
"activitypub"
]
],
"content": "some confusions folks have mentioned with merge commits so far are:\n\n- they make git bisect more confusing\n- unclear how to revert them (you need to `git revert -m 1 COMMIT_ID` or something)\n- merges can introduce bugs by accident, even if the code merges cleanly\n- they take up space and make it harder to scan for information about the actual code changes\n- \"backwards\" merges make the graph confusing\n- it's harder to scan the history by time to identify a recent problem commit\n\n(3/?)",
"sig": "1dda8253bcc8dc585efe9fe5568dd7fa7e3374257f084f598258ea9b7f3ec254bb437fcab620585426b574442a29ea37fea5686a6a9cd83865a2880798e512d7"
}