nvazquez commented on PR #12190: URL: https://github.com/apache/cloudstack/pull/12190#issuecomment-5571727423
@guillemtp I have reverted the target PR back to main branch and only your changes are being displayed again. For rebasing to the branch 4.22 please consider the following steps, assuming the `origin` remote is your fork of the repository and `upstream` is the Apache CloudStack upstream repository: - git fetch upstream - git checkout 4.22 - git pull --rebase upstream 4.22 (get the latest 4.22 branch code) - git checkout cpu-lscpu-speed-detection-fix - git pull --rebase origin cpu-lscpu-speed-detection-fix - git format-patch -1 (this will create a patch file) - git reset --hard 4.22 - git am <PATCH_FILE> (usually starts with 0001-xx) - git push origin cpu-lscpu-speed-detection-fix -f After that, you can change again the target PR to 4.22 on Github. Please let me know if you have any questions -- 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]
