mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
If the checked-out branch can be fast-forwarded to the selected branch, "git merge --squash" doesn't refuse to run while there are staged changes, unlike a merge that can't be fast-forwarded. It adds the changes of the branch to the ones that are already staged. "Squash merge and commit" then commits the staged changes along with the squashed ones, without the user noticing. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>