clock appears when trying to pull from git & commit

[MjApo123]

Clock appears when trying to commit and won't let me continue. I'm not sure where I went wrong.

[DavidRach]

Hi @MjApo123, it looks like you tried sending in a commit without writing a commit message first. If you close the Commit-EditMsG tab, it should end the waiting for response cycle and you should be able to try again. If that doesn't work, close Positron, and reattempt with a commit message.

Best-
David

[MjApo123]

I'm not able to pull week 5 data into Positron. I'm not sure what I did. I don't see any updates in source control...

[DavidRach]

Hi @MjApo123, looking at your forked Cytometry in R folders commit history, it looks like you made a couple commits (including one that deleted the week 5 folder).

The not being able to pull issue is because this causes a merge conflict with the parent repository (which why not making commits in the local forked Cytometry in R folder is one of my class weekly reminders since it is easy mistake to make).

To revert back, first make sure if you did add any files to the CytometryInR folder to copy them elsewhere on your computer first. Then you will need to click on the terminal tab in Positron.

Then enter

git reset --hard f08bd45

This will hard reset the repository back to the way things were during the "Non-Glitchy Week 05 Audio" commit which is where we are currently at course content wise.

Best-
David