Azure DevOps-拉取请求Git“下一步:手动解决这些冲突并将新更改推送到源分支." [英] Azure DevOps - Pull Request Git "Next steps: Manually resolve these conflicts and push new changes to the source branch."
问题描述
我创建了一个名为dev的分支.
I have created a branch named dev.
我已经完成了一个拉取请求，将开发代码发送给master，当我执行这个拉取请求时，它告诉我:
I have done a pull request to send dev code to master, when I do this pull request it tell me:
50多个冲突会阻止自动合并 下一步:手动解决这些冲突并将新的更改推送到源分支."
50+ conflicts prevent automatic merging "Next steps: Manually resolve these conflicts and push new changes to the source branch."
我从这里去哪里?我只希望所有dev分支替换master中的所有分支.我看不到解决这些冲突的选项.
Where do I go from here? I just want all the dev branch to replace whatever is in master. I see no options to resolve these conflicts.
推荐答案
您将必须在PC上执行以下操作
You will have to do the following on your PC
在分支dev
$ git pull --no-rebase origin master-这将创建一个合并提交，您将必须解决在dev和master上都已更改的文件中的冲突. git status将显示具有冲突更改的文件列表.
$ git pull --no-rebase origin master - This will create a merge commit and you will have to resolve the conflicts in the files which are changed both on dev and master. git status will show the list of files with conflicting changes.
解决冲突后，提交所有更改并推送分支.之后，您应该能够完成PR.
After resolving conflicts, commit all the changes and push your branch. After that you should be able to complete the PR.
仅供参考:-不重新设置，即使将拉动行为覆盖为默认值以重新设置设置，也可以确保完成合并.
FYI: --no-rebase makes sure that a merge is done even if the pull behavior is overwritten to default to rebase.
这篇关于Azure DevOps-拉取请求Git“下一步:手动解决这些冲突并将新更改推送到源分支."的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！
