I have a remote Git server, here is the scenario which I want to perform:
For each bug/feature I create a different Git branch
I keep on com
If you have already git merge bugfix on main, you can squash your merge commit into one with:
git merge bugfix
main
git reset --soft HEAD^1 git commit