shwstppr commented on PR #12681: URL: https://github.com/apache/cloudstack/pull/12681#issuecomment-3950240101
@dheeraj12347 your branch `ui-template-bulk-delete-404-fix` is not correctly rebased to apache 4.22. One way could be, ``` git checkout 4.22 git pull --rebase apache 4.22 #check if remote is apache or origin git branch -D ui-template-bulk-delete-404-fix git checkout -b ui-template-bulk-delete-404-fix git cherry-pick 2244c01fa1779098be6ae9c3dffbde76e9fa00a3 #fix any conflicts git cherry-pick cf2f33178ee99974a2e24cecb60c57feac368cd7 #fix any conflicts git push dheeraj12347 ui-template-bulk-delete-404-fix -fv ``` -- 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]
