3 ms·
If you want more controversial things about squash, here are two that I posted here last week: 1. "How squash merge can break Git repos with submodules", about
by lucasoshiro 2y ago
If you want more controversial things about squash, here are two that I posted here last week:
1. "How squash merge can break Git repos with submodules", about a situation where squash merges silently broke a repository: https://news.ycombinator.com/item?id=40846596 https://news.ycombinator.com/item?id=40846596
2. "Git: please stop squash merging!" giving some technical explanation about what squash merges actually are under the hood and how the misconceptions about Git leads to invalid "pros" about squash merging: https://news.ycombinator.com/item?id=40840572 https://news.ycombinator.com/item?id=40840572
- fmorel 2y agoThe first is solvable with a PR check. You can do whatever you want with the submodule on your branch, but if you want it to merge to `main`, then your changes to the submodule have to merged to its `main`. We have a check that makes sure the referenced commits is on `main`, and not older than 10 PRs.