Familiarity with the two-day git use and git basic commands is used, but is not known for the process of collaborative development.
Reference some articles on the Internet http://www.ruanyifeng.com/blog/2015/12/git-workflow.html
This article describes three processes git flow, github flow, Gitlab flow and their respective features.
However, combined with our actual development, I feel that we three people cooperation, feature is not very easy to score, so simply follow our three people's name to create a branch, cooperative development. Sort of a little clearer about the work flow.
1. The remote warehouse set up master, Dev, small A, small B, small c five branches. 2. Everyone locally only need to keep their own branch warehouse. For example, my local branch only needs to have a small a branch.
3. A new version is opened and each of us develops on its own branch.
4. If little B completes its own part of the task and plans to submit this part of the completed task, he can push his local small B branch to the remote Small B branch and then create a pull request on GitHub and request a merge to the Dev branch. Wait for others to review and merge after the merger, If not, modify the code to resubmit the pull request.
5. At this time, small c also completed a part, you can push the content of the local small c to the remote small C branch, and then the same on GitHub to create pull request, request to merge into the Dev branch, waiting for review, after merging.
6. Everyone is in sequence until the development is complete and everyone's code is merged into the Dev branch.
7. Test Dev No problem, after publishing, merge the dev content into the master branch and build the tag. Complete the version iteration.