git process:
git init --bare
git checkout -b develop
git checkout -b feature1
feature1:
git add .
git commit -m "xxx"
git branch --set-upstream-to = origin / feature1 # push arranged feature1 remote feature1
git push # Set on a direct push
git push origin feature1 # equivalent to git push origin feature1: feature1
( $ git pull <远程主机名> <远程分支名>:<本地分支名>
git push origin 本地分支:远端希望创建的分支 )
The first practice
git checkout develop # on the develop branch, commit others have also been a push over.
git merge feature1 # branch will be ugly conflict
The second approach (recommended)
git rebase master # feature1 branch at this time is generally understood to merge the rebase adjusted simply merge commit sequence
The instruction is modified to interpose the master branch, branch on the final modified feature1, so commit along the very line.
git checkout develop
git merge feature1
git branch rename：
git branch -m master psoc
The master changed psoc