From: Don Zickus on
gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1177#note_6145...
@prauld, I am not sure what you did. Your steps seem correct but the MR seems
to be a mess. At this point it might be faster to just create a backup
branch, reset the original MR to os-build and cherry-pick the single commit
over.
git checkout -b rt_group_sched_bk # verify single commit is there
git checkout rt_group_sched
git reset --hard origin/os-build # reset your original branch to latest os-
build to start over
git cherry-pick <single commit in rt_group_sched_bk>
That is just one way to move past this. I am sure there is a better way.