cannot fetch upstream

[ellielai]

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]

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

[ellielai]

Yes, I think it did, thank you!