First of all:
1, Project Leader To create a repository on GitHub
2, the head of git clone repository to a local address
3, create a Django project leader at the local clone to project inside
4, the git add and git commit operation in the current project, will be submitted to the Django project above GitHub
5, head of the invited team members to jointly develop the project (in settings inside, this crew is not)
Process:
1、git status
2, git add file did change
3, git status (this will turn green when the file)
4, git commit -m description of some of the changes
5, git fetch the contents of the above remotely take over
6, git merge the local and remote files Django above documents do merge (merge conflicts may occur) my previous blog which has been talked about a simple branch and merge conflict resolution problem: https://www.cnblogs.com /tulintao/p/11024262.html
7, git push origin master current push content to the master remote GitHub above the main branch
These are the most basic processes, there is to recommend that whenever someone changed a piece of content items, it is best that you explain in detail changes in the readme file, which is to facilitate collaborative development when other the crew of View
This is inside the fetch and merge before the call is to push after commit