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
Thanks for your help - I do appreciate it!
However, when I view the pull request ( https://github.com/andrewgoz/BangleApps/pull/1 ), there is no "Resolve Conflicts". The bottom of the page looks like:
https://imgur.com/a/8wl5mwH
It appears I can't resolve this using the web interface! I tried clicking on "Use the command line" but I'm puzzled by the example commands referring to your repo and not mine.
It's after midnight here now and I don't want to make things worse. I'll try again tomorrow night. Thanks again for your help.