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

ISSUE-371: Allow qualified keyword names for rules and queries #389

Conversation

WilliamParker
Copy link
Collaborator

I've created a PR of the changes from #382 squashed together on top of master with the merge conflicts fixed. Given the large number of commits and discussion on #382 I'd prefer to avoid addressing merge conflicts in the GitHub web editor.

This looks OK to merge to me. @mrrodriguez do you see anything problematic here and/or anything from the original PR #382 that hasn't been addressed yet.

Note: I added @sparkofreason as the commit author; the changes are all his apart from the merge conflict resolution.

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.

2 participants