git提交时冲突问题解决

git status   //查看改动
git add .    //添加到本地仓库
git commit -m:"备注"     //提交
git pull --rebase origin xxx  //从远程仓库拉项目
git status  //再看看是不是一样的
git push origin xxx  //提交到远程仓库 

//gitlab的话还得登录gitlab账号去create merge request

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...

git add .
git commit -m:"xxx"
git rebase --continue
git status
git push origin xxx

//如果冲突已经解决完了的话，这里不会出意外