 <p>Try putting these in <code>.git/info/attributes</code>:</p> <pre><code># whatever gets them... yourfile binary -delta merge=binary *.yourext binary -delta merge=binary </code></pre> <p>that'll cause merge conflicts if those files change, and you'll have to figure out what to do with them. check the gitattributes and rebase doc for other merge strategies, I'm not even going to name the dangerous ones here.</p> <p>I'm not sure it's the actual merge trying to get the whole thing in core from running, but it seems worth a try.</p>