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.

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

Fix creation of remote control processor #242

Merged
merged 1 commit into from
May 3, 2016
Merged

Fix creation of remote control processor #242

merged 1 commit into from
May 3, 2016

Conversation

izaera
Copy link

@izaera izaera commented Apr 26, 2016

Resend of previous pull request changing require_relative to require.

@deivid-rodriguez
Copy link
Owner

Thanks @izaera , I need you to rebase the PR so I can merge it.

@izaera
Copy link
Author

izaera commented Apr 27, 2016

Is that enough for merging @deivid-rodriguez? I'm not really sure what happened... I thought I had rebased locally before issuing the PR :-o

@deivid-rodriguez
Copy link
Owner

@izaera I like a linear PR rebased on top of master before merging it, so I'd like you to rework (or reopen) this PR to have a single commit. Regarding the build failure, I'm pretty sure it has nothing to do with this change.

@izaera
Copy link
Author

izaera commented Apr 29, 2016

OK. I have pushed -force the rebased commit. I finally discovered what happened: I was rebasing with origin/master instead of upstream/master :-( (that's because we don't use upstream right now at work).

@deivid-rodriguez
Copy link
Owner

deivid-rodriguez commented Apr 29, 2016

OK. I have pushed -force the rebased commit.

Thanks @izaera ! :)

I finally discovered what happened: I was rebasing with origin/master instead of upstream/master :-( (that's because we don't use upstream right now at work).

Yee, that happens.

You're having very bad luck with this PR, lots of problems that are not your fault... Now the Appveyor build is failing... Could you try changing gem install bundler to gem install bundler -v 1.11.2 in appveyor.yml in another commit and see if that fixes the build?

@deivid-rodriguez
Copy link
Owner

I added the workaround myself. You just need to rebase again.

@izaera
Copy link
Author

izaera commented Apr 29, 2016

There you go 👍

@deivid-rodriguez
Copy link
Owner

I'm so sorry for being a pain in the ass, but the current config of the repo is very strict... I still need another rebase for merging.

@izaera
Copy link
Author

izaera commented May 3, 2016

Done :-).

@deivid-rodriguez deivid-rodriguez merged commit 59c0331 into deivid-rodriguez:master May 3, 2016
@deivid-rodriguez
Copy link
Owner

Thanks for your patience!

@izaera
Copy link
Author

izaera commented May 3, 2016 via email

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.

2 participants