Files
lazygit/pkg/integration/tests
Stefan HallerandClaude Opus 5.5 a7fcae2ca1 Add a test for squash merging while there are staged changes
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>
2026-11-08 15:36:41 +01:00
..
2025-11-16 17:26:00 +01:00
2025-01-03 10:50:36 +11:00