> try to do a squash merge to the main, then do some other changes in your branch, and try to merge again For this situation, at the end just do: git rebase -

> try to do a squash merge to the main, then do some other changes in your branch, and try to merge again For this situation, at the end just do: git rebase -i main And delete all of the commits that you included in your squashed commit. If you want to preserve your detailed history you can create a new branch for the rebase like so: git checkout -b mybranch-rebase && git rebase -i main