Skip to content

Conversation

@hramos
Copy link
Contributor

@hramos hramos commented Aug 4, 2016

#9149 resolved an issue where Edit on GitHub links lead to a release branch, which results in pull requests being opened against a release branch instead of master. Many issues "resolved" in this manner have already been addressed in master.

This PR is intentionally against 0.30-stable as it is cherry-picking changes already landed to master.

@hramos
Copy link
Contributor Author

hramos commented Aug 4, 2016

@JoelMarcey you're the cherry-picking expert here, did I do it right? :)

@ghost
Copy link

ghost commented Aug 4, 2016

By analyzing the blame information on this pull request, we identified @caabernathy and @JoelMarcey to be potential reviewers.

@ghost ghost added GH Review: review-needed CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. labels Aug 4, 2016
@JoelMarcey
Copy link

@hramos I think so. I see 8 commits here. We all of these commits part of one final squashed commit when landed into master? Or are all of these separate commits in master itself?

@hramos
Copy link
Contributor Author

hramos commented Aug 4, 2016

My process here was:

  1. Check out 0.30-stable locally.
  2. Go to https://github.com/facebook/react-native/pull/9149/commits to find all the commits in that PR
  3. For each of them, run git cherry-pick <commit> in order.
  4. Commit

Seems like for step 2 I should have cherry-picked just the one squashed commit to master instead? That being 01cb1e4

@JoelMarcey
Copy link

@hramos Yeah. I think the one, squashed commit would be better to cherry-pick moving forward. However, GitHub loves us and gives us a Squash and Merge :)

So we are ok for this one, as long as we choose that.

screenshot 2016-08-04 15 56 09

@satya164
Copy link
Contributor

satya164 commented Aug 4, 2016

cc @grabbou

@hramos
Copy link
Contributor Author

hramos commented Aug 5, 2016

Since 0.31 stable is now out, I'll go ahead and open a new PR against it with a proper single squashed commit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants