Tell us what’s happening:
I’m probably around 80% done with the lesson. The last step I completed successfully was " Replace pick with s next to your commit for adding the rename table reference to squash it. Be careful not to do the wrong one. When you are done, save and exit Nano."
The problem is, the next step starts on the second screen of Nano, where I’m suppsoed to edit the commit message post-squash. The step is " The lines that don’t start with a # will be the commit messages. Add a new message at the top of the file on it’s own line. Give it the text, fix: add missing rename references . When you are done, save and exit the file."
But I made a mistake, and instead of adding one line with fix: add missing rename references, I added that and a blank line. Obviously the test was not recognized as ‘correct’ because of the blank line, and I was thrown out of Nano. I tried using the “Reset” button, but the “Reset” button does not bring me back to the second screen of Nano, instead throwing me back into the terminal.
When I try to run the previous command (i.e. git rebase --interactive HEAD~2), I get the following error:
error: cannot rebase: You have unstaged changes.
error: Please commit or stash them.
I then notice two files that were never on my project tree: test/.cwd and test/.next_command. I can’t seem to get rid of them. Discarding or stashing them only makes them re-appear, and they prevent me from going back into the interactive rebasing. I assume there’s a way to roll back the clock and undo my mistakes and try again, but if the “Reset” button was supposed to simplify this, it’s not working.
The hints tell me to ensure Nano is closed, and it seems to be. I can’t say for sure, but I assume if it was open I would see it’s interface in the terminal, and I Just don’t.
Any tips would be welcome, thanks. It would not be nice to re-start the tutorial which took almost 90 minutes for me to get to this point, just because of a blank line, particularly when it wasn’t clear a blank line would ruin the whole thing.
Your code so far
https://freecodecam-learngitbyb-br15eun0zfh.ws-us116.gitpod.io/
Your browser information:
User Agent is: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:132.0) Gecko/20100101 Firefox/132.0
Challenge Information:
Learn Git by Building an SQL Reference Object - Build an SQL Reference Object