git rm "file" on conflict resolution whenever a file is deleted by the changes

[RobertReaves]

~/github/web-card-slice  ➦ 31e5628 ●✚ >R>  git status
interactive rebase in progress; onto 1f38802
Last commands done (2 commands done):
   pick cbc7304 Use SplitButton for Save in Card Details Dialog
   pick dfe119e Added and Updated Tests for new Save SplitButton Integration
Next commands to do (2 remaining commands):
   pick d76ff76 Changed localStorage key to save.button.state.card and removed board-slice button state
   pick a3d65b5 Merge pull request #223 from elijahmanor/feature-split-button-save
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'promote-release-v11.5.0-split-button.0' on '1f38802'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   client/js/components/CardActions/CardActions.js
        modified:   client/js/stores/cardStore.js
        modified:   client/spec/components/CardActions.spec.js
        deleted:    client/spec/components/CardActionsSaveMenu.spec.js
        modified:   client/spec/components/CardDetails.spec.js
        deleted:    client/spec/components/SplitButton.spec.js
        modified:   client/spec/index.spec.js
        modified:   client/spec/stores/cardStore.spec.js

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)

        deleted by them: client/spec/components/CardActionsMoreMenu.spec.js

 ~/github/web-card-slice  ➦ 31e5628 ●✚ >R> 