Steve,
I keep forgetting what some git keywords perform. I took out the combined shortcut git commands and I added in what I think they are performing. You did this already, but maybe if I say what I see occuring you can tell what I don't understand. I did follow your instructions and it worked on my second attempt. I must have typed something wrong the first shot.
Take the assignments one commit at a time. First focus on C2. From the end goal, it's clear that C2 should be made from the bugFix branch. bugFix doesn't exist yet, so start by creating it and checking it out:
git branch bugFix -branches can be made quickly anytime the user needs one.
git checkout bugFix -It moves the asterisk * to bugFix so it becomes the tip, HEAD? git has focus here. I'm not exacly sure what the * means.
Now, you create commit C2 from the bugFix branch:
git commit - it adds C2 and gives it the *
Now we need to create commit C3, but from the main branch:
I'm not done working on this yet. I am pressing Submit so that I don't lose my work. I need to leave for now, but I'll get back to it in a day or two. Thank you. Kevin
git checkout main -
git commit
Finally, we rebase commit C2 onto the main branch:
git checkout bugFix
git rebase main