Github user DaanHoogland commented on the pull request:
https://github.com/apache/cloudstack/pull/1277#issuecomment-170352576
got an error during the install:
```
/data/git/cs1/cloudstack
Done.
HEAD is now at 2a9927a Merge pull request #1315 from pavanb018/master
Switched to branch 'master'
Branch master set up to track remote branch master from origin.
Already up-to-date.
Deleted branch try/1277 (was 2a9927a).
Switched to branch 'try/1277'
WARNING: You used --force to merge to 'try/1277' while this PR is for
branch '4.7'.
INFO: Using remote repository 'origin' to fetch PR (should point to
github.com/apache/cloudstack.git)
INFO: PR #1277 against branch '4.7' from 'wilderrodrigues': '[4.7] Critical
VPCVR issues fixed: CLOUDSTACK-9154; CLOUDSTACK-9187; and CLOUDSTACK-9188'
INFO: has state 'open' and mergable state 'clean', about to be merged in
branch 'try/1277'.
ATTENTION: Merging pull request #1277 from
ekholabs/fix/4.7-rvpc-net-gc-CLOUDSTACK-9154 into 'try/1277' branch in 5
seconds. CTRL+c to abort..
5 4 3 2 1 0
INFO: Executing the merge now.. Git output below:
INFO:
***********************************************************************************
From https://github.com/apache/cloudstack
* [new ref] refs/pull/1277/head -> pr/1277
Auto-merging
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
CONFLICT (content): Merge conflict in
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
Automatic merge failed; fix conflicts and then commit the result.
ERROR: Merge failed, aborting.
ERROR: Merge failed!
```
my check script uses the ```git pr``` command from the cloudstack repo
---
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.
---
