dheeraj12347 commented on PR #12681: URL: https://github.com/apache/cloudstack/pull/12681#issuecomment-3956975644
> @dheeraj12347 , I think you still need to rebase your two commits on 4.22 as now 127 merged commits from main are in your PR and these are not supposed to go on 4.22. > > ``` > git rebase —onto 4.22 c79b33c1fbd4840613fa8a09cbffc9b76ea0b1a1 > ``` > > should do the trick. after that you need to force push your branch to your fork. @DaanHoogland, I created a fresh branch from upstream/4.22, cherry‑picked only my two UI commits, and force‑pushed it over ui-template-bulk-delete-404-fix-4.22. git log --oneline upstream/4.22..ui-template-bulk-delete-404-fix-4.22-clean shows exactly these two commits only. On the PR I now see just these two commits, but the Files changed tab still shows ~1,094 files. Could you please confirm if the branch looks correct from your side or if I should adjust anything else? -- 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]
