Github user DaanHoogland commented on the pull request: https://github.com/apache/cloudstack/pull/1547#issuecomment-219063444 :+1: maybe squash the conflict entries out? you can rebase -i HEAD^7 and then reorder the commits. If you put the last one at position 3 and change the prefix 'pick' to 'f' for fixup you should be fine.
--- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---