DaanHoogland commented on PR #8897: URL: https://github.com/apache/cloudstack/pull/8897#issuecomment-2055828272
@rp- , RMs do so on a regular basis. A lot of merge commits can be found. On any branche not in freeze you/any of us can as well. There is a tool git-fwd-merge in ./tools/git that can do it and rolls back on conflicts. when on the path it can be called as `git fwd-merge`. A regular git merge works as well when conflicts occur. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
