hotfix-功能关键字
Merge Requests
feature-功能关键字
Origin branch
git pull origin pre
hotfix
pre
git checkout -b hotfix-key origin/master
master
git push origin hotfix
git pull origin feature
git checkout -b feature-key origin/master
git checkout feacturegit merge dev
Local branch
git checkout featuregit merge feature-key
dev
git push origin dev
git pull origin hotfix
git checkout hotfixgit merge hotfix-key
git pull origin master
git checkout devgit merge feature-key
feature
git checkout mastergit merge pre
git pull origin dev
git push origin pre
git push origin master
git checkout pregit merge dev
