search

comp426-2022-fall / a02

Create a command line Node.js package that ingests API data from Open-Meteo
GNU Affero General Public License v3.0
0 stars 0 forks source link

Branches have diverged for assignment 2 since the autograder was configured. Can no longer commit and push changes. #13

Closed Elvin-Liu237 closed 1 year ago

Elvin-Liu237 commented 1 year ago

Your branch and 'origin/main' have diverged, and have 4 and 6 different commits each, respectively. (use "git pull" to merge the remote branch into yours)

I have tried every version of git pull but all of them have gotten me nowhere.

smelliskay commented 1 year ago

This is likely an issue/discrepancy with local commits rather than staged modification. It is also possible you'll need to rebase. ("git rebase origin/master")

https://stackoverflow.com/questions/2452226/master-branch-and-origin-master-have-diverged-how-to-undiverge-branches

On the link I just sent is a bunch of different fixes. Work through some of these and if you are still having issues comment back.