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
I was thinking about this at work today and realized that I was over-complicating things.
While I couldn't see it in GitHub, the only possible conflict could have been the apps.json file, so when I got home tonight I manually copied the latest content from the espruino repo and copied it into mine (keeping a copy of my app entry in a text editor). That unlocked the "Fetch upstream" which completed, then I restored my app entry.
Now I can do those tweaks I wanted to do two nights ago, and hopefully once I submit a pull request and get my entry into the main apps.json file, I won't have this problem again.