maddox
Use HTTParty 0.8.2 instead of the latest version
Using the latest version of HTTParty (0.8.3) caused an error, which made imdb_party unusable (https://github.com/maddox/imdb-party/issues/11).
can you fix this up to be synced with master, so I can get my green button back? :)
@britishtea from what I know from bitbucket.org, when you own a repo and you have a pull request, there's a button to merge the changes directly from the web interface. If there are conflicts in the merging, the button is gone.
When @maddox asks you to sync your pull request with master, he is probably asking you to apply your changes on top of his master, so he can get his "green button back".
Since your pull request consists of only 1 commit, I think you can just rebase your commit on top of his newest master and update your pull request.
Please correct me if I'm wrong.
Bingo. :)
On Jul 29, 2012, at 8:41 PM, Fernando Brito [email protected] wrote:
@britishtea from what I know from bitbucket.org, when you own a repo and you have a pull request, there's a button to merge the changes directly from the web interface. If there are conflicts in the merging, the button is gone.
When @maddox asks you to sync your pull request with master, he is probably asking you to apply your changes on top of his master, so he can get his "green button back".
Since your pull request consists of only 1 commit, I think you can just rebase your commit on top of his newest master and update your pull request.
Please correct me if I'm wrong.
— Reply to this email directly or view it on GitHub.