-
Notifications
You must be signed in to change notification settings - Fork 50
git cooperation
We usually have four types of branch which are master,dev,release,personal.
master branch is a stable branch, it only change when some release branches get stable and are merged into master.
dev branch is a active developing branch, it continuously integrate new features developed by all developers. dev branch is created from master branch.
personal branch is the work branch of some feature. It's created from dev branch. Everytime after finishing developing on personal branch, you need merge it back to develop.
- first merge develop to update other co-workers' revision.
- second solve merge conflict
- compile and check correctness
- commit and pull-request, merge back into develop
release branch is the publishing branch. It's also created from dev branch. When we arrive at some milestone on our dev branch, we will create a branch like "release-1.0" from dev branch. After publishing this branch, we may receive some bug reports about this release. Then we need to fix bug and the "release-1.0" get stable finally. At last, we merge it back to master branch.
For contributors by forking, they need to add revision on correspondent branch. If you are developing a new featyre, you need to add code on dev branch. If you are fixing some bugs on release branch, you need to add code on release branch. After finishing writing code, press pull-request button.