git merge vs git rebase vs git squash
git merge
git rebase
git squash
https://www.cnblogs.com/xgqfrms/p/16800776.html
https://www.cnblogs.com/xgqfrms/p/16798792.html