Instead, to squash git commits, the interactive git rebase is used. To squash all commits on a single branch, the interactive git rebase command must be passed one of two arguments: ...

As for dealing with the conflicts over and over, you should rebase your local branch onto trunk after you push a squash. IIRC (been a few years), that can be configured to happen automatically.

A git rebase rewrites the commit history of one branch so that the other branch is incorporated into it from the point where it was created.

Git credentials leak fix If you inadvertently set your GitHub credentials as your Git username and email, and you haven’t pushed your commits to a remote repository, simply delete your unwanted ...