Github user richardcloudsoft commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/106#issuecomment-51202763
There's something not quite right in the history here. Prior to 'This
closes 99' is a commit by Aled, "JavaSoftwareProcessSshDriver: installing
java". But if I look at the master branch history, the precursor of 'This
closes 99' is Alex's commit "tidy up of location and security config in docs".
So this PR's branch history is not exactly the same as master branch. How it
got like this I do not know - the SHA of 'This closes 99' *is* the same in both
branches which means that barring an astronomically small chance of a hash
collision, it has the same parents...
I'm not sure how to fix this. The brute force way would be to git fetch
--all, make a new branch off master, cherry-pick your commits into it, and then
force-push it into this 'ere branch.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
