Unfortunately No. i don't think its possible for you to squash a commit into a merge commit using git standard tool (rebase commit --amend ) without redoing the resolution manually. but you can recreate the merge from scratch this time very clean using --no-commit. Alternatively you can avoid this by fixing everything before committing the merge.