title: How do you handle native library conflicts in React Native?
body: <p>When I try to merge two branches that have different native libraries added to them (through <code>npm install X</code> and <code>react-native link</code>), I get conflicts in these files:</p>
  
  <pre><code>CONFLICT (content): Merge conflict in ios/myapp.xcodeproj/project.pbxproj
  CONFLICT (content): Merge conflict in android/settings.gradle
  CONFLICT (content): Merge conflict in android/app/src/main/java/com/myapp/MainApplication.java
  CONFLICT (content): Merge conflict in android/app/build.gradle
  </code></pre>
  
  <p>What's the best way to resolve these conflicts? Should any of these files be gitignored? </p>