-
Notifications
You must be signed in to change notification settings - Fork 92
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
Add induction on partizan games #4592
Conversation
The discouraged file should not be added by hand, but generated automatically. I do this with mmj2. |
Thank you - how do I generate the discouraged file with mmj2 on a Mac? I added the discouragement tag to a theorem that's a weaker technical lemma to the following theorem. |
One option is to use an online service such as github codespaces https://github.com/codespaces/new where you can run commands on a linux machine through the internet (note: When I tested the link it mentions "paid for by", but the default spending limit is 0$ and I dont reach the limit unless I take hours) |
I updated the discouraged file so it should be good now. Is this ready to merge? |
set.mm
Outdated
-> ps ) ) $. | ||
$( Version of ~ pgind with extraneous not-free requirements. (Contributed | ||
by Emmett Weisz, 27-May-2024.) (New usage is discouraged.) $) | ||
pgindnf $p |- ( ph -> ( A e. Pg -> th ) ) $= |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, this is not named as lemma, but it seems to be a lemma for ~pgind. So the remarks on ~ pgindlem apply also for this theorem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that's what I intended. Is there anything I need to add or change about the file?
Is everything ready to merge? |
You appear to still have merge conflicts. What is Github reporting for your merge? |
I'm not so experienced with git so I don't understand exactly what you're referring to. There's a message saying
" There's a greyed out button next to it saying resolve conflicts |
The from-branch https://github.com/emmett-w/set.mm/tree/pginduction is 4164 commits behind this one. The message means there are conflicts between the from-branch and the 4164 commits Since there are so many intermediate commits, probably the easiest thing to do is to make a new updated branch and do the commits again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The merge was successfully done 🎉 (Diff of effective changes to set.mm/develop) between 2nd and 4th commit:
discouraged
@@ -> 3252 @@
+ "cbvralv2" is used by "pgindnf".
@@ -> 15373 @@
+ New usage of "cbvralv2" is discouraged (1 uses).
(There's probably a replacement for cbvralv2 somewhere but I can't find it. But pgindnf will probably be changed in the future to use the replacement)
Thank you! |
I think I might need an edit to the discouraged file, but I'm not sure how to do that on MacOS. All the changes are just within my mathbox though.