git supports a variety of workflows, so generally we use, create a remote master branch, local person to create a functional branch, the daily work process is as follows:
To their work branch$ git checkout workbranch
jobs....
Submit the revision of the branch$ git commit -a
Back to the main branch$ git checkout master
Get Remote latest changes, this time without conflict$ git pull
Branch back to work$ git checkout workbranch
Rebase trunk with the modified merger, at this time if there is a conflict resolved$ git rebase master
Back to the main branch$ git checkout master
The combined work of branch changes, this time without conflict.$ git merge workbranch
Submit to a remote trunk$ git push
Disclaimer: This article is a summary of bloggers learning sentiment, limited, if inappropriate, please correct me. If you think good, welcome to reprint. Reprinted with references please indicate the author and source.