After following the lab recording, I was trying to complete the merging step through the rebase option, but I seem to be getting an error. I went through the file and fixed the errors, but I am getting this:
interactive rebase in progress; onto a021770
Last commands done (5 commands done):
pick 74bba17 Fixes README typos rebased
pick af2c048 fixed typo of registers
(see more in file .git/rebase-merge/done)
Next commands to do (19 remaining commands):
pick d7dccfd topic_01
pick 0aa15c1 topic_01
(use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch '2023spring' on 'a021770'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: topic_01_functional_programming/README.md
So instead of telling me no commands remaining, it is telling me I still have 19 but I cannot find them in the file.
To fix this, do I have to refork and reclone the repo?
Hi Mike,
After following the lab recording, I was trying to complete the merging step through the rebase option, but I seem to be getting an error. I went through the file and fixed the errors, but I am getting this:
So instead of telling me no commands remaining, it is telling me I still have 19 but I cannot find them in the file.
To fix this, do I have to refork and reclone the repo?