In rebase conflicts, how to say "use file from branch A, blow away file from master"?
<p>I am pulling a branch from github, <code>my-new-branch</code>, in order to review it. It has minified build files in (I know, I know). I am unsurprisingly getting a conflict in the minified file when I pull/rebase.</p>

<p>I don't want to manually review every change in the minified file. I just want to say "use the file from <code>my-new-branch</code>, blow away the file from master, continue rebasing". </p>

<p>How can I do this?</p>