提交冲突解决

Posted 2020-12-19 hongzhuang

一、将本地文件修改后push到远程分支有时会出现  devlops|MERGE

 

git add .

git commit -m "feat:优惠券功能"

git pull

........... (devlops|MEARGE)

git add .

git commit -m "feat:优惠券"

git push

 

 

二、push的时候出现rejected

$ git push -u origin branchName

To https://gitlab.hangjia.online/changqing/vue-node.git
 ! [rejected]        case -> case (non-fast-forward)

error: failed to push some refs to ‘https://gitlab.hangjia.online/changqing/vue-node.git‘
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: ‘git pull ...‘) before pushing again.
hint: See the ‘Note about fast-forwards‘ in ‘git push --help‘ for details.
# 可以尝试强制push

$ git push -u origin branchName -f