binaryfiles - Git Merge - Binary File Conflict Resolution -

how resolve binary file conflict resolution during merge operation in git? here's i've done far:

git checkout master git fetch origin git merge working_branch  ... [conflicts] ...  git status ... unmerged paths:         both modified:   path/file.dll         ... 

i want keep version in working_branch , discard version in master. how do this?

figured out earlier today:

git checkout --theirs path/file.dll git add path/file.dll git commit -m "resolved merge conflict checking out file working_branch , adding master"