Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply RxJava #1625 manually #9

Merged
merged 1 commit into from
Aug 27, 2014
Merged

Apply RxJava #1625 manually #9

merged 1 commit into from
Aug 27, 2014

Conversation

zsxwing
Copy link
Member

@zsxwing zsxwing commented Aug 27, 2014

zsxwing added a commit that referenced this pull request Aug 27, 2014
@zsxwing
Merge pull request #9 from zsxwing/rxjava-1625
8223de1 
Apply RxJava #1625 manually
@zsxwing zsxwing merged commit 8223de1 into ReactiveX:master Aug 27, 2014
@zsxwing zsxwing deleted the rxjava-1625 branch August 27, 2014 02:26
@jbripley
Copy link
Contributor

What git commands did you use for this merge? I'm trying to do the same thing for ReactiveX/RxJava#1641

@zsxwing
Copy link
Member Author

zsxwing commented Aug 31, 2014

I used git format-patch -1 d7895b8 --stdout > foo.patch to create a patch of commit d7895b8 in rxjava. Then I used git am -p3 foo.patch to apply the patch into rxscala. -p3 will fix the different paths between rxjava and rxscala projects.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@zsxwing @jbripley