Tip: Git Squash and Force Push Tips

• Try to avoid changing files on the local branch while updating contents on the web for the remote branch simultaneously. We may forget or lose track of what we did on the web and cause conflict with the local branch.

• Always use "git rm" to remove files, so git has the index to track them. 

• git rebase interactive mode is a wonderful tool to squash commits. Refer link

• git force push is an alternative way to overwrite or squash commits for the remote branch. 

• git push -f -u origin <branch name>