cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From DaanHoogland <...@git.apache.org>
Subject [GitHub] cloudstack pull request: resolving a conflict due to reformatting
Date Mon, 18 Jan 2016 12:51:44 GMT
Github user DaanHoogland commented on the pull request:

    https://github.com/apache/cloudstack/pull/1344#issuecomment-172519784
  
    This due to the PR being for a merge commit. You could have just pushed it upstream
    The extra merge does nothing
    the extra file (s?) is only in the conflict resolving. It should be only one and it is
also in one of the commits before.


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

Mime
View raw message