Closed danilobellini closed 10 years ago
:+1:
@danilobellini could you send the pull request to the 0.1.x branch. Even better if you put it just set for the merge!
Thanks
It seems that GitHub doesn't allow changing the branch of a pull-request [anymore]. So I can't change this pull-request to point to the 0.1.x branch. That would be another pull request. I think a sync without any commit like this would be enough (after merging with master):
git checkout 0.1.x
git merge master
git push origin 0.1.x
This would apply this pull-request to both master and 0.1.x branches. If you don't want to apply these changes to master, any collaborator can just merge this pull request directly to the 0.1.x branch:
git remote add danilo https://github.com/danilobellini/pyNES.git
git checkout -b analyser
git pull danilo analyser
git checkout 0.1.x
git merge analyser
git push origin 0.1.x
That's just to avoid opening a new issue for the same idea/contents/data.
That merge was simple, I spent more time to find why a commit you did 8 months ago conflicted with this pull request from a fork recently done hehehe...
No problem! I do it :+1:
UnknownToken
instance with an useful error message, when it is the case (new class)code_line_generator
function)