This is a good and small tutorial on rebasing and squashing commits: 
https://help.github.com/articles/about-git-rebase/

I'm not confident on rebasing the PR myself, as it now lists 103 commits and I 
don't know exactly which ones should I cherry-pick to properly merge the 
feature.

I'd suggest you proceed however works best for you: if you want to try rebasing 
the PR and reduce it to a single clean commit, it is OK. If you find it easier 
to close this PR and open a new one starting from master, it is OK too. In the 
end, we just want to have this merged in a single commit, so the commit history 
cleanly reflects the commit where the feature was introduced.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds-labs/pull/412#issuecomment-344512819

Reply via email to