DaanHoogland commented on PR #12681: URL: https://github.com/apache/cloudstack/pull/12681#issuecomment-3958651811
> > > 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? > > > > > > @dheeraj12347 , I see 129 commits. It looks like you didn’t create your new branch form the head of 4.22 but from main. > > First `git checkout 4.22`, then `git pull` and then try the `git rebase —onto 4.22 c79b33c1fbd4840613fa8a09cbffc9b76ea0b1a1`-method. > > I have made two commits as you have asked ... If in the commits you scroll down you will see my two commits .... That was the commit you are looking for or do I need to again change something?? all the other commits are on main, this means your commits are still based on main and if we merge this we merge all of main into 4.22. I do not know what you did but this is not the result of the git rebase, as I described it. -- 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]
