Rebase and Squash Branch
1. on “test” branch.
2. git rebase -i master (don’t pull at that point)
3. squash (if necessary solve the conflicts)
4. on “master” branch use git rebase test5.
git branch -D test6. delete also remote branch
git push origin --delete test
*replace “test” with your branch.