Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/48#issuecomment-48458263
Also, if you can squash the commits so that history is cleaner that would
be nice. But if you feel that is too much hassle then just let me know. (`git
rebase -i HEAD~7`).
Note that I generally avoid commits with "merge" in my PRs by always using
`git pull --rebase`. This old thread contains some useful git commands, which
I've been meaning to turn into docs and/or blog post for a very long time:
https://groups.google.com/forum/#!msg/jclouds-dev/iZYY5TyrgA0/vsVzb5HkN9MJ
One last git tip. If you rebase your commits and do `git push -f` then
beware of strange git defaults! See
http://stackoverflow.com/questions/948354/git-push-default-behavior and
http://longair.net/blog/2011/02/27/an-asymmetry-between-git-pull-and-git-push/
for an explanation, and for what you want to do (e.g. something like `git
config --global push.default current`).
---
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.
---
