功能分支
功能分支
推荐团队中采用 Merge Request 的方式进行协作开发,即基于主分支 clone 之后再合并回去:
git checkout dev
git pull --rebase --prune
git checkout -b feat/x # or fix/y
# coding time
# may commit several times
git commit -m ''
# make sure rebase from origin dev branch
git fetch
git rebase origin/dev
git push # maybe `-f` flag is required if you've pushed before rebase
# create Merge Request to dev branch
# code changes according MR review
# confirm to rebase again in case others merged before your MR
git fetch
git rebase origin/dev
git push