dev
new merge request
git push -f origin feature
git rebase origin/dev
feature（个人分支）
是
master
git commit
否
git clone url
点击merge Requests
到gitlab进入项目
git fetch
git checkout -b feature
修改冲突git add git rebase --continue
冲突
git checkout -b dev origin/dev
git add
git pull origin dev
