Git 合并 - 二进制文件冲突解决
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"
如何在 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"