- Published on
After a hotfix is made on dev and cherry-picked to main, the main→dev backmerge PR still shows the fix as changed. The PR page is answering a different question. Two git commands show what the merge will actually change.
Git
All Posts
- linux (3)
-
git (2)
- cryptocurrency (2)
- finance (2)
- freelancing (2)
- remote-work (2)
- vowifi (2)
- wifi-calling (2)
- stormfiber (2)
- next-js (2)
- migration (2)
- cloudflare-workers (2)
- guide (2)
- wlan (1)
- wi-fi (1)
- pta (1)
- github (1)
- code-review (1)
- workflow (1)
- amazon (1)
- xmr (1)
- monero (1)
- version-control (1)
- dual-boot (1)
- bluetooth (1)
- windows (1)
- troubleshooting (1)
- hacking (1)
- jazz (1)
- nvidia (1)
- battery-optimization (1)
- hybrid-graphics (1)
- power-management (1)
- kde (1)
- wayland (1)
- net-neutrality (1)
- astro (1)
- svelte (1)
- claude-code (1)
- global-payments (1)
- privacy (1)
- proton (1)
- certification (1)
- fiat (1)
- crypto-card (1)
- ai (1)
- llm (1)
- agents (1)
- story (1)
- ai-assisted (1)
- tmux (1)
- ssh (1)
- velite (1)
- vinext (1)
- pakistan (1)
- investing (1)
- mutual-funds (1)
- financial-inclusion (1)
- personal-finance (1)
- pnpm (1)
- supply-chain-security (1)
- javascript (1)
- package-management (1)
-
-
- Published on
An in-depth analysis of the disadvantages of squash merge in Git, why it leads to loss of information, and why normal merge is always the recommended approach, with examples from the Linux kernel and other successful open-source projects.