5.git rebase operation,
Also refer to:
https://www.jianshu.com/p/6960811ac89c
http://www.ruanyifeng.com/blog/2015/08/git-use-process.html
1) The master sync branch submitted to the dev branch:
Performed in the dev branch: git rebase master
If there is no conflict: git push -f
In case of conflict: there will be conflict prompt, change file specific conflicts, revised and stored, then git add xxx (file name conflicts) then git rebase --continue during the operation, and finally git push -f
2) were combined as a commit commit1 commit2 commit3
git log to find a commit id before commit1 to xxx
git rebase -i xxx
The following prompt will pop up, the bottom is the latest submission, the line was changed to 2,3,4 pick s
This will be incorporated into the first row, save and exit
Then let you fill commit describe, if you do not fill is the default, you can save out
And then do git push -f
