search

mikeizbicki / cmc-csci046

CMC's Data Structures and Algorithms Course Materials
54 stars 154 forks source link

Confusing Git error #372

Closed justin-is-away closed 1 year ago

justin-is-away commented 1 year ago

Hi Mike,

I ran into this problem while trying to fix the Tutorial title:

hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I own a separate Github account for side projects. I don't know what happened here, but at some point when I pushed the changes, I saw that the other account posted a pull request (which is now gone, and my forked version of this repository is up to date with this one.)

The current status of my forked repository (in the lambda server) is that both the Tutorial title and README.md file from class is fixed, but I cannot push them and submit a pull request. I'm not sure how to proceed.

mikeizbicki commented 1 year ago

Good question.

The problem is that your github fork or lambda server has gotten some extra commits from somewhere. We'll be talking about how to fix this in class on Wednesday, so the easiest thing is to just wait until then.