- git merge --squash replaces git merge --no-ff - Merge agent prompt updated for squash flow - Fallback detection uses staged changes instead of MERGE_HEAD - Abort uses git reset --merge instead of git merge --abort - Store fallback merge also squashes + commits