title: Resolving added and deleted conflicts Git
body: <p>I have a branch <code>release-x.x.x</code> that I would like to merge into the master. However it has hundreds of merge conflicts when I do a pull request. I think this is due to a Swift 3 migration I performed. Either way I want to use all the versions of the files in <code>release-x.x.x</code> when merged into <code>master</code>. I have done <code>checkout release-x.x.x</code> and <code>git merge -s recursive -X ours master</code>. I am doing it in reverse so I can resolve conflicts on the <code>release-x.x.x</code> and then create a pull request on <code>master</code> and keep all the commit history.</p>
  
  <p>When I run <code>git status</code>, this is some of the output:</p>
  
  <pre><code>added by us:     Pods/FirebaseCrash/Frameworks/frameworks/FirebaseCrash.framework/FirebaseCrash
  added by us:     Pods/FirebaseCrash/Frameworks/frameworks/FirebaseCrash.framework/Headers/FIRCrashLog.h
  added by us:     Pods/FirebaseCrash/Frameworks/frameworks/FirebaseCrash.framework/Headers/FirebaseCrash.h
  added by us:     Pods/FirebaseCrash/Frameworks/frameworks/FirebaseCrash.framework/Modules/module.modulemap
  deleted by them: Pods/FirebaseCrash/README.md
  deleted by them: Pods/FirebaseCrash/batch-upload
  deleted by them: Pods/FirebaseCrash/upload-sym
  deleted by them: Pods/FirebaseCrash/upload-sym-util.bash
  deleted by us:   Pods/FirebaseInstanceID/CHANGELOG.md
  added by us:     Pods/Intercom/Intercom/Intercom.framework/Versions/A/Intercom
  both added:      MyProject/Base.lproj/Localizable.stringsdict
  both deleted:    MyProject/Localizable.stringsdict
  both added:      MyProject/en-HK.lproj/Localizable.stringsdict
  </code></pre>
  
  <p>I assume I want to keep anything with <code>added by us</code>, <code>both added</code> and also keep anything marked <code>deleted by them</code>, so I have staged these files. How do I deal with <code>deleted by us</code> and <code>both deleted</code>? If I try <code>git rm Pods/FirebaseInstanceID/CHANGELOG.md</code> I get the error: <code>Pods/FirebaseInstanceID/CHANGELOG.md: needs merge</code>. Am I on the right track here at all?</p>