Git - how to automatically resolve "deleted by us" conflict when cherry-picking : <p>I run the following command:</p>

<pre><code>git cherry-pick SHA --strategy-option theirs
</code></pre>

<p>and get a conflict like this waiting for manual resolution:</p>

<pre><code>deleted by us: SOME_FILE
</code></pre>

<p>Is there a way to make git automatically resolve such conflicts by adding files <em>deleted by us</em>?</p>
