title: How do I fix a merge conflict due to removal of a file in a using cherry-pick?
body: <pre><code> git cherry-pick --strategy=recursive -X theirs -n &quot;$GitHub_SHA&quot; 
  </code></pre>
  <p>Hello, I'm specifying -s recursive -X theirs, why is it still necessary to git rm and git add?</p>
  <p>Also how do i differentiate when to git rm or git add in my bash script?</p>
  <pre><code>git cherry-pick --strategy=recursive -X theirs -n &quot;$GitHub_SHA&quot; || merge_conflict=1
  
     if [ ${merge_conflict:-0} -eq 1 ]
      then
      git add -all
     fi
  </code></pre>