git branch to push the code on the user's steps and conflict resolution

Generally and colleagues completed a demand.

1.git add . -A

2.git commit

3.git pull

4.git push

Time if a conflict git pull arise, resolve conflicts, merge, manually resolve

Then git rebase --continue then git push.

If the annotation information to fill in error, write this in great detail

https://www.jianshu.com/p/098d85a58bf1