git代码冲突问题用命令行解决
1查看日志
git log –oneline
2查看远程日志,是否和本地的一致
git log remotes/origin/release-20210923-V730 –oneline
3 拉取远程仓库分支,让本地仓库保持一致
git pull origin release-20210923-V730:remotes/origin/release-20210923-V730
4 查看冲突文件git diff
5 git add .将所有文件加入暂存区
6$ git rebase --continue
git pull origin release-20210923-V730:remotes/origin/release-20210923-V730 --rebase