Skip to content

Latest commit

 

History

History
14 lines (13 loc) · 705 Bytes

SYNCING.md

File metadata and controls

14 lines (13 loc) · 705 Bytes

Syncing OSS changes to fork

  1. Make sure latest main-dxp branch is checked out
  2. Create feature/sync branch git checkout -b feature/sync
  3. Make sure OSS repository is added as separate remote. git remote add oss git@github.com:TheWidlarzGroup/react-native-video.git
  4. Fetch all tags git fetch --all --tags
  5. List OSS release tags git ls-remote --tags oss
  6. Merge OSS release tag git merge v6.X.X
  7. Solve conflicts
    1. Make sure CHANGELOG is ordered properly: OSS release X -> fork releases based on X -> OSS release Y
  8. Check is sample is working
  9. Add all changes git add .
  10. Commit all changes git commit -m "Sync 6.X.X"
  11. Push changes git push -u origin feature/sync