CODEWITHSUNDEEP
gitbinaryfilesgit-mergemerge-conflict-resolutiongit-merge-conflict
Jim Fell
Jim Fell

Reputation: 14264

Git Merge - Binary File Conflict Resolution

How do I resolve a binary file conflict resolution during a merge operation in git? Here's what I've done so far:

git checkout master
git fetch origin
git merge working_branch

... [Conflicts] ...

git status
...
Unmerged paths:
        both modified:   Path/file.dll
        ...

I want to keep the version in the working_branch and discard the version in the master. How do I do this?

Upvotes: 6

Views: 10538

Answers (1)

Jim Fell
Jim Fell

Reputation: 14264

Figured it out earlier today:

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"

Upvotes: 12

Related Questions