Open BuggusMageevers opened 1 year ago
@MatsMoll - started an REPL.
you might want to consider rebasing this PR onto upstream/master to avoid rewriting all that history...
You know what, that sounds like a great idea. I'm not really sure how I got my local repo so out of sync though. @Spongman, I'm not great with git. I should be able to just do a rebase and place my changes as the most recent commit?
yeah, you should be able to do something like:
git stash # save any changes in your working dir
git fetch --all # sync with the server
git checkout master # switch to local master branch
git reset --hard origin/master # sync with your github repo
git rebase upstream/master # rebase your changes onto the upstream branch
git push -f # force-push to your github repo
git stash pop # restore your working dir changes
I use these defaults, ymmv:
git config --global rerere.enabled true
git config --global pull.rebase merges
git config --global rebase.autoStash true
git config --global rebase.autosquash true
Thank you, I'll give that a try.
Ended up deleting my local, cloning from Prime's repo, applying my changes, committing, and pushing this to my fork. I had not done all that much so it seemed easiest. Should have fixed the history problem.
Added initial REPL. Needs a little work yet before merge: adds multiple EOF's currently. However, the token's produced are otherwise correct and the REPL can be exited with "quit".