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'm new to Github and not really sure what I'm doing. I'd hoped to make a couple of tweaks to the app that I'm developing tonight, but when I got to Github and attempted to do my usual "fetch upstream" to keep things up to date, it told me there was a conflict.
I've poked around and tried to figure out what the problem was. I got to a point where I appear to need to download git and start using command-line instructions(!), which seems ridiculous as I've been using the GitHub web interface exclusively so far.
My repo is at https://github.com/andrewgoz/BangleApps
I suspect the problem is another app got added to the main apps.json, and that change conflicts with my addition. I've tried to manually edit my apps.json, but the conflict remains.
I don't know what to do. Any advice would be appreciated.