cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhaisaab <>
Subject [GitHub] cloudstack pull request: 4.6 to master
Date Sun, 29 Nov 2015 08:15:59 GMT
Github user bhaisaab commented on the pull request:
    @remibergsma I used the git pr tool so not sure how the commit ID changed, I merged the
other PR because 4.6 merge on master chose the other change while merge conflict resolution
which did not solve the regression fixed in 4.6.
    Fwd-merging is fine, but the way we're merging Github PRs it's difficult to track changes
even using --no-merges with git log. IMO the git log history is practically unreadable or
followable, along with the fact that we don't squash merge changes for each github PR.

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 or file a JIRA ticket
with INFRA.

View raw message