[GitHub] cloudstack pull request: resolving a conflict due to reformatting

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 conf

[GitHub] cloudstack pull request: resolving a conflict due to reformatting

Github user remibergsma commented on the pull request: https://github.com/apache/cloudstack/pull/1344#issuecomment-172503325 After merging this PR shows much more commits and changed files than before merge. For the record, this what I saw at the moment of merging: ![

[GitHub] cloudstack pull request: resolving a conflict due to reformatting

Github user asfgit closed the pull request at: https://github.com/apache/cloudstack/pull/1344 --- 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

[GitHub] cloudstack pull request: resolving a conflict due to reformatting

Github user remibergsma commented on the pull request: https://github.com/apache/cloudstack/pull/1344#issuecomment-172500103 LGTM Run the tests to be sure, all fine. ``` nosetests --with-marvin --marvin-config=${marvinCfg} -s -a tags=advanced,required_hardware=true \ c

[GitHub] cloudstack pull request: resolving a conflict due to reformatting

Github user thecodeassassin commented on the pull request: https://github.com/apache/cloudstack/pull/1344#issuecomment-172453755 for what it's worth: LGTM --- 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 do

[GitHub] cloudstack pull request: resolving a conflict due to reformatting

Github user remibergsma commented on the pull request: https://github.com/apache/cloudstack/pull/1344#issuecomment-172368421 Thanks @DaanHoogland FYI this was the conflict after fwd-merge: ``` rbergsma[~/git/apache/cloudstack](master)$ git diff diff --cc engi

[GitHub] cloudstack pull request: resolving a conflict due to reformatting

GitHub user DaanHoogland opened a pull request: https://github.com/apache/cloudstack/pull/1344 resolving a conflict due to reformatting You can merge this pull request into a Git repository by running: $ git pull https://github.com/DaanHoogland/cloudstack master Alternatively