What state is the repository in right after this?
$ git switch main $ git merge --squash feat Squash commit -- not updating HEAD
- Changes staged; no commit created yet
- One squashed commit is now on
main - A merge commit with two parents exists
featis rewritten into one commit
--squash applies the combined changes to the index without moving HEAD. You must run git commit, and the result has a single parent.