search

twingly / twingly-search-api-java

:coffee: Twingly Blog Search API in Java
https://developer.twingly.com/resources/search/
3 stars 7 forks source link

Updated PR from master sub-branch #12

Closed xSAVIKx closed 8 years ago

xSAVIKx commented 8 years ago

I've merged your changes with my documentation changes, so this master_pr branch contains all your changed to README.md and points your travis-ci also.

walro commented 8 years ago

Ok, README is better, now it's just the matter of the weird looking history. I think what we proposed here: https://github.com/twingly/twingly-search-api-java/pull/11#issuecomment-193188520 could work (you'd need to force push too). Maybe you could squash commits and force push to make things look tidier, but I am uncertain as you merged our changes pretty late.

xSAVIKx commented 8 years ago

ah. I've tried to make correct rebase with squash, but had no luck :-(

walro commented 8 years ago

Any progress? If you are unable to workout the needed git magic you could re-fork and apply your changes manually and submit a new PR from a fresh repository.

xSAVIKx commented 8 years ago

Nope, but I'm on holiday today, as I've written.

walro commented 8 years ago

Alright, have a nice holiday!

xSAVIKx commented 8 years ago

I've cleaned-up commits history in my master branch, so now I'll create new PR branch and submit new PR from that one