小编CBB*_*ike的帖子

我创建了一个名为dev的分支.

我已经做了一个pull请求将dev代码发送给master,当我执行这个pull请求时它会告诉我:

50多个冲突阻止自动合并"后续步骤:手动解决这些冲突并将新更改推送到源分支."

我从哪里开始？我只想让所有dev分支替换master中的所有东西.我认为没有办法解决这些冲突.

我正在尝试提取一个也应该提取 aspnet:4.7 图像的图像。但是 docker 一直告诉我图像“已经存在”，但事实并非如此。有没有办法告诉 Docker for Windows 无论如何都要拉取所需的图像？

PS C:\WINDOWS\system32> docker pull -a [hidden]/mycode
dev: Pulling from [hidden]/mycode
3889bb8d808b: Already exists
e29afd68a947: Already exists
36f010181129: Already exists
94c1c860b007: Already exists
d8096eabbf13: Already exists
67025ded22a8: Already exists
dbe75d79f130: Already exists
84d3d4630614: Already exists
301ba58699fa: Already exists
5e9f3c14f629: Already exists
90fd39402ca5: Already exists
4791db5edc55: Pull complete
1da86da74a58: Pull complete
3acc18896b8f: Pull complete
Digest: sha256:dc7e28154e63d5c22a210c314b4a80dcdba7baeea0ebf853445853680276293d
prod: Pulling from [hidden]/mycode
3889bb8d808b: Already exists
e29afd68a947: Already exists
36f010181129: Already exists
94c1c860b007: Already exists
d8096eabbf13: …