Closed ninjadynamics closed 2 years ago
Super, thanks @ninjadynamics! Looks like your git repository is in a tangle though -- you have a merge commit and some commits from master in there, and there are merge conflicts.
It might be easiest to start a new branch based off bfirsh:master
, then cherry pick the commits you want to keep.
Also: would you mind putting the saving state example at the end of that little block of examples? I think have running frames and controls first makes more sense as a narrative of how it works.
Hi! Sure, I'll try to do some housekeeping! This is actually my first time collaborating on github, so sorry about that! '^__^
Alright, I think I have everything in order now. :)
My repository contains only 3 little changes:
Wonderful, thanks. Unfortunately it still looks like your branch is broken. You might want to google how to rebase a git branch, or create a new branch and cherry pick.
Unfortunately, I can't see any conflicts on my side... Should I "refork" JSNES, apply the changes and create a new pull req?
You don't need to refork -- probably best to make a new branch, then cherry pick the commits you need. GitHub docs should be able to help you out here, and I can also do myself when I have a bit more time :)
I tried rebasing as you suggested. All tests green and GitHub reports no merge conflicts. If it doesn’t work, I don’t know what else to do. 😐
Hello again,
This is a rather simple pull request, just added load/save state examples to the readme file.