I have 5 files that have merge conflicts with master. When I click the Resolve link or use Web Editor link, it get what appears to be the beginning of a blank edit screen with a spinning wheel that just hangs. I've let it spin for 10 minutes and it won't allow editing of the first of the 5 files I need to fix. anyone else run into this. Ah, I should mention I'm using the latest version of Firefox on Mac OS 10.14.5.
... View more