Skip to content

Conversation

bparadie
Copy link
Owner

I don't intend to ever merge this branch. This PR is just to document the delta between facebook/react-native and bparadie/react-native#adobe.

@bparadie
Copy link
Owner Author

Waiting for facebook#774 to be merged into the main line...

# sync with facebook/react-native
git remote add facebook https://github.com/facebook/react-native.git
git checkout master 
git pull facebook master
git push origin master

# create v0.5.0-rc branch and pick PR 774
git checkout -b v0.5.0-rc
git remote add jsierles https://github.com/jsierles/react-native.git
git pull jsierles camera-roll-video-assets
git push origin v0.5.0-rc

@bparadie
Copy link
Owner Author

Can't merge facebook/master, see facebook#1654

@bparadie
Copy link
Owner Author

At this point the only delta between (a rather old) facebook/master and this branch is facebook#1546. In the meantime I am considering merging facebook#1406, see thumbnail branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants