Github user aledsage commented on the issue:
https://github.com/apache/brooklyn-server/pull/836
By the way, I don't entirely trust merge commits inside a pull request. It
has seemed to me previously that `/files` in github has not shown me all the
code changes because some are implicit in a merge commit. I'm not sure of the
exact situation though. It happened when I was once trying to take a PR's
changes into a maintenance branch, but it seemed that the `.patch` github
mechanism didn't treat the merge commits as I'd have expected.
I know that you have quite a sophisticated way of using git branches and
merges locally, but when it reaches the PR stage is it not possible to just
have it rebased against master such that it appears as a series of normal
commits on top of brooklyn-server master?
---
