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

Resolve Conflicts Between uid and dev #92

Merged
merged 39 commits into from
Mar 10, 2022
Merged

Conversation

charlestian23
Copy link
Collaborator

The purpose of this pull request is to resolve conflicts between dev and uid so it can be merged into dev later without any conflicts.

charlestian23 and others added 30 commits December 21, 2021 12:57
Renamed the rule to "Unreachables are Black"
charlestian23 and others added 9 commits March 9, 2022 10:18
Modified all the generic constructors so they accept a ruleID parameter
Added all the IDs from shorttruthtable_reference_sheet.txt for elimination rules
Added all the rule IDs for introduction rules from shorttruthtable_reference_sheet.txt
Added all the IDs for case rules from shorttruthtable_reference_sheet.txt
Added rule IDs for contradiction rules from shorttruthtable_reference_sheet.txt
…s-not-working

Fixed Short Truth Table IDs
@charlestian23 charlestian23 merged commit 81ab94b into dev-uid_resolve-conflicts Mar 10, 2022
@charlestian23 charlestian23 deleted the uid branch April 26, 2022 14:47
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