weizhouapache commented on PR #10968: URL: https://github.com/apache/cloudstack/pull/10968#issuecomment-3237493968
> @weizhouapache What is the best way to switch this to `main` branch? I can edit this PR and select `main`, but it gives a warning and just want to make sure I don't make things worse. At the same time, I kinda hate to re-base and `main` and push up and create a new PR, because of all the review/comments in this one. from my experience, the best way is, merging remote main branch into local branch and fixing the conflicts. if there are multiple commits in the PR, we only need to fix the conflicts once. when conflicts are fixed, build the source code locally and then force-push to github. just bare in mind that, log4j 2.x is used since 4.20, so you need to update the code (to use logger/LOGGER/logging, please check other logging messages in the same file) (normally we fix the logger issues during merge forward) -- 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: commits-unsubscr...@cloudstack.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
