develop分支合并到release分支
develop -> release
Check out, review, and merge locally
Step 1. Fetch and check out the branch for this merge request
git fetch origin
git checkout -b develop origin/develop
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin
git checkout origin/release
git merge --no-ff develop -> 会产生一个不属于任何分支的HEAD
Step 4. Push the result of the merge to GitLab
git push origin release
😱 一般都会卡在第四步的 git push origin release
会得到一个提示,让你切到一个指定分支
解决办法:
git fetch origin
git checkout origin/release
这时候HEAD会被追加到这个release分支上
如果有冲突就解决冲突并commit
没有冲突和变化也是正常的,因为已经被提到commit里面了
这时候你只需要执行 “推送” || push
就成功了(当然,也可能提示无权限之类)
detached HEAD state参考文章