Comments on: How to resolve a binary file conflict with Git

By: Skydiver

Skydiver — Sun, 11 Nov 2012 21:27:00 +0000

git status –porcelain | sed -r -e ‘s/…(.*)/git checkout –theirs ./1/’ >../tmp
mv ../tmp .
./tmp
rm tmp

this work’s for me.

By: roleic

roleic — Fri, 26 Nov 2010 10:36:37 +0000

The described approach seems useful for a single one or only few binary files in conflict. How can this approach be efficiently used with a large number of binary files in conflict distributed in a large tree mixed with text files?

By: Kevin Miller

Kevin Miller — Fri, 29 Jan 2010 14:11:39 +0000

Thank you for figuring this out. This means that I messed up and did the git equivalent of Resolve Using Mine when I wanted the opposite. Looks like I’ll use your post to fix that.

By: Elijah Manor

Elijah Manor — Fri, 29 Jan 2010 04:56:46 +0000

Thanks. I just started using git not too long ago. I haven’t run into this message yet, but I am sure I will soon. Thanks for the insight!

This will be tech tweeted tomorrow morning at 9am cst ;)