can't rebase, running into this problem:
http://stackoverflow.com/questions/3133449/why-does-git-rebase-give-me-merge-conflicts-when-all-im-doing-is-squashing-comm
plus this problem:
http://stackoverflow.com/questions/9229301/git-cherry-pick-says-38c74d-is-a-merge-but-no-m-option-was-given

i'm afraid i took a wrong turn somewhere, maybe pulling/merging at all?

don't know what to do except to delete the whole thing, fork and create a
new pull request.

-Ben

--------------------
Ben Wheeler
mobile 917.254.1578


On Wed, Jan 8, 2014 at 3:54 PM, Erik Michaels-Ober <notifications@github.com
> wrote:

> In examples/Search.md:
>
> > +
> > +See the [Configuration][] example for info about keys/tokens/secrets.
> > +
> > +[Configuration]: https://github.com/sferik/twitter/blob/master/examples/Configuration.md
> > +
> > +```ruby
> > +require 'twitter'
> > +
> > +client = Twitter::REST::Client.new do |config
> > +  config.consumer_key = "YOUR_CONSUMER_KEY"
> > +  config.consumer_secret = "YOUR_CONSUMER_SECRET"
> > +  config.access_token = "YOUR_ACCESS_TOKEN"
> > +  config.access_token_secret = "YOUR_ACCESS_SECRET"
> > +end
> > +
> > +client.search("#helloworld", :count => 10).each do |tweet|
>
> Please rebase and then git push -f. You only have to worry about not
> pushing rebased changes if you’re working on a team, where other people
> might have pulled your changes and then pushed new changes based on that
> base.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/sferik/twitter/pull/505/files#r8738635>
> .
>