cannot fetch upstream - Githubissues

CMU-MS-DAS-Modern-Programming-Mini / ClassAssignmentNo3

Creative Commons Zero v1.0 Universal

0 stars 0 forks source link

cannot fetch upstream #2

Open ellielai opened 3 years ago

ellielai commented 3 years ago

When I hit the 'Fetch Upstream' drop-down, it says that I have conflicts that need to be resolved, so I can't hit the 'Fetch and Merge' button, so I'm not sure what to do. I think it's because I tried editing the requirements.txt file, but I'm unsure.

shots47s commented 3 years ago

I believe I have everything reset now, you can fetch upstream now and see if it works.

ellielai commented 3 years ago

Yes, I think it did, thank you!