alexkli commented on issue #58: URL: https://github.com/apache/openwhisk-wskdebug/pull/58#issuecomment-616726654
@rabbah Thanks for the reviews! Regarding the conflict: that would be entirely avoidable if (true) merging would be allowed on PRs: this PR was simply on top of #56 and if that one would have been merged instead of rebased, git would know and this here would not show as a conflict. However, the repo settings here prevent one from choosing merge as an option. I assume that's an Openwhisk project policy? Could it be allowed? I agree with preferring clean histories without a lot of "merge" commits on master. However, in some cases like this it's not avoidable and one is loosing a major git feature if merging is entirely prevented. In our in-house development we address this by allowing all options on PRs, but ask people to avoid merging unless necessary. This way you still avoid the majority of merge commits on master. I guess I should bring this to the dev list? /cc @dgrove-oss ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
