Git strategy - Shaunakdas/doc_genius_native GitHub Wiki

Major Branches

  • expo: [Changes to expo folder only] pure expo branch which will contain part of App which will work perfectly with Expo demo app(with hot/live re-load).
  • ejected: [Changes to expo and android folder] extension of expo branch which will include RN libraries which require react-native link.
  • unity_android: [Changes to android folder only] will contain changes to the exported folder of unity.
  • integrated: [Changes to the whole app] everything finally comes here.
  • test_^branch^: [Changes to the whole app] test script for each branch, checked out from that branch.
  • backup_^branch^: [Changes to the whole app] backup of each branch, checked out from that branch.

Branch Extensions

expo

expo_app

  • Impacting primarily expo/App.js and small changes to expo/pages, expo/constants and expo/components
  • Parent Branch: expo

expo_<page>

  • Impacting primarily expo/pages, expo/constants and expo/components
  • Changes to expo branch page by page basis.
  • Parent Branch: expo_app

ejected

  • checked out from expo, rebased with expo and merged into itself.

ejected_app

  • Impacting primarily android,package.json,expo/pages, expo/constants and expo/components
  • Parent Branch: ejected

ejected_<page>

  • Impacting primarily android,package.json,expo/pages, expo/constants and expo/components
  • Changes to ejected branch page by page basis.
  • Parent Branch: ejected_app

unity_android

  • checked out from ejected, rebased with ejected and merged into itself.
  • For every new version of unity project, the exported folder is modified with latest Data.
  • Impacting android/src/main/assets/bin/Data folder only.

integrated

  • checked out from unity_android, rebased with unity_android and merged into itself.
  • Files related to linking between unity and react native is added her. Impacting primarily NativeModule in expo/pages, android/src/main/java/com/math/genius/*.java and android/src/main/AndroidManifest.xml

integrated_link_<feature>

  • Parent Branch: integrated
  • For every new type of link between react native and unity part.
⚠️ **GitHub.com Fallback** ⚠️