Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge branch 'lua-51-testsuite'" #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

lukego
Copy link

@lukego lukego commented Oct 12, 2016

This PR reverts the merge of branch lua-51-testsuite into master. This would be one way to achieve what @dibyendumajumdar suggests in #8 (comment).

The effect of merging this PR would be to revert the changes introduced on that branch while still keeping a stable history on master (no rebases). If whoever is maintaining the master branch does want to revert this version of the lua-51-testsuite, and does want to keep a stable history on the master branch, then they could consider merging this PR.

If in the future we do more work on the lua-51-testsuite branch and want to merge it again then the solution would be to first revert this revert and then do a new merge for the newer changes:

git revert 07477ee         # revert of revert i.e. restore the changes that were reverted
git merge lua-51-testsuite # pull in new changes made since the original merge

See How to revert a faulty merge for full details.

…LuaJIT-test-cleanup into lua-51-testsuite"

This reverts commit 7b022d4, reversing
changes made to b116313.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant