You are reading a single comment by @gfric 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.
@gfric
Hi,
I'm a bit new to this github thing.
I forked the repo and now I see 2 branches to choose "master" and "espruino-master". I made some changes to my code and I think I was in "master". Now I tried to pull changes at the original repo, but I can't. It says "This branch is 353 commits behind the upstream and has conflicts that must be resolved.".
I opened a "pull request", I think that means, that my changes are going to be merged into the original repo and then I can pull again.
My changes are very subtle. Is there a way to get back to the "current state" of the original repo, and do my changes there, so I can keep up to date with Gordon's changes?
Or... I mean... I'm a bit lost how to work with github.