You are reading a single comment by @andrewg_oz and its replies.
Click here to read the full conversation.
Espruino is a JavaScript interpreter for low-power Microcontrollers. This site is both a support community for Espruino and a place to share what you are working on.
@andrewg_oz
This is what I'm seeing:
https://imgur.com/a/g2kBPrR
The first image is my repo landing page and to date I've been clicking the "Fetch upstream" button. It normally "just works", but now it's showing "Open pull request" as shown.
The second image is what I get when I click "Open pull request". Last night I tried to create a draft pull request (the "Update repo #1"), but I couldn't make sense of what I was seeing. I thought a draft request would be discarded, but it seems draft requests are quite permanent!
For the third image I've just clicked on the "Files changed" tab. The fourth image is that page scrolled down a bit.
I don't know if those help at all. I can't see anything that looks like a conflict??!! Everything just looks like typical everyday additions and deletions. I have no idea what it's complaining about.