Sven A. Schmidt on Nostr: Folks who squash their #git merges, I’m curious why you are making that trade-off. ...
Folks who squash their #git merges, I’m curious why you are making that trade-off. I’m guessing the pro argument is a cleaner merge graph?
The big argument against it for me is that you lose granularity for git bisect. I've often been able to narrow down breakage (sometimes long past the merge) due to individual commits in the merge. If I'd merged in a giant blob all I'd have had to go by is that giant blob. (1/2)
Published at
2024-05-11 09:32:13Event JSON
{
"id": "37ee8f0f0d609d3f75d1c2247a2fd22b06bfce06232f4e1f456593ef6336bafb",
"pubkey": "250382d8a35406905a5c7c8174319c7785e91735493af743ffb167b4276357c6",
"created_at": 1715419933,
"kind": 1,
"tags": [
[
"t",
"git"
],
[
"proxy",
"https://mastodon.social/users/finestructure/statuses/112421760742397384",
"activitypub"
]
],
"content": "Folks who squash their #git merges, I’m curious why you are making that trade-off. I’m guessing the pro argument is a cleaner merge graph?\n\nThe big argument against it for me is that you lose granularity for git bisect. I've often been able to narrow down breakage (sometimes long past the merge) due to individual commits in the merge. If I'd merged in a giant blob all I'd have had to go by is that giant blob. (1/2)\n\nhttps://files.mastodon.social/media_attachments/files/112/421/760/693/657/586/original/9f0c585074a27f90.png",
"sig": "fb04e05e5b832cd99ffb79b976282428af0d6e731513b7eef5296e5a3e1242ba45e351b150ff2ea77cf055c8c7ba8bab87549a73d7b4a3c05485c788a506afb5"
}
