[英]Git Merge - Binary File Conflict Resolution
如何在git中合并操作期间解决二进制文件冲突解决? 这是我到目前为止所做的:
git checkout master
git fetch origin
git merge working_branch
... [Conflicts] ...
git status
...
Unmerged paths:
both modified: Path/file.dll
...
我想将版本保留在working_branch
并丢弃master
的版本。 我该怎么做呢?
今天早些时候想出来:
git checkout --theirs Path/file.dll
git add Path/file.dll
git commit -m "Resolved merge conflict by checking out file from working_branch and adding it to the master"
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.