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

[Merged by Bors] - fix: patch for std4#198 (more mul lemmas for Nat) #6204

Closed
wants to merge 3 commits into from

Conversation

fgdorais
Copy link
Collaborator

@fgdorais fgdorais commented Jul 28, 2023

@fgdorais fgdorais added WIP Work in progress t-number-theory Number theory (also use t-algebra or t-analysis to specialize) t-algebra Algebra (groups, rings, fields etc) blocked-by-std-PR This PR depends on a PR in Std labels Jul 28, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the blocked-by-other-PR This PR depends on another PR which is still in the queue. label Jul 28, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Aug 7, 2023
@fgdorais fgdorais changed the title fix: patch for std4#198 fix: patch for std4#198 (more mul lemmas for Nat) Aug 21, 2023
@bors bors bot changed the base branch from master to ScottCarnahan/BinomialRing2 September 17, 2023 03:25
@semorrison semorrison changed the base branch from ScottCarnahan/BinomialRing2 to master September 17, 2023 12:14
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Nov 1, 2023
@fgdorais fgdorais force-pushed the fgdorais-nat-mul branch 3 times, most recently from 344607b to 8009c99 Compare November 1, 2023 15:38
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Nov 2, 2023
@fgdorais fgdorais added awaiting-review The author would like community review of the PR and removed WIP Work in progress labels Nov 2, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added merge-conflict The PR has a merge conflict with master, and needs manual merging. and removed merge-conflict The PR has a merge conflict with master, and needs manual merging. labels Nov 2, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Dec 10, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Dec 10, 2023
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 3, 2024
@fgdorais
Copy link
Collaborator Author

fgdorais commented Jan 4, 2024

I'm stumped on the last error in Mathlib.FieldTheory.SeparableDegree, any thoughts? @eric-wieser @semorrison

@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 4, 2024
@semorrison
Copy link
Contributor

Unfortunately this branch doesn't have oleans, and I don't want to take the time to build myself right now. Could you merge and ping again?

@fgdorais fgdorais force-pushed the fgdorais-nat-mul branch 2 times, most recently from 4de040b to fecdc72 Compare January 5, 2024 02:54
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 5, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 9, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the blocked-by-other-PR This PR depends on another PR which is still in the queue. label Jan 11, 2024
@leanprover-community-mathlib4-bot
Copy link
Collaborator

This PR/issue depends on:

@semorrison semorrison removed merge-conflict The PR has a merge conflict with master, and needs manual merging. blocked-by-std-PR This PR depends on a PR in Std labels Jan 11, 2024
@semorrison
Copy link
Contributor

bors p=10

@semorrison
Copy link
Contributor

bors merge

@github-actions github-actions bot added ready-to-merge This PR has been sent to bors. and removed awaiting-review The author would like community review of the PR labels Jan 11, 2024
mathlib-bors bot pushed a commit that referenced this pull request Jan 11, 2024
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
@mathlib-bors
Copy link

mathlib-bors bot commented Jan 11, 2024

Pull request successfully merged into master.

Build succeeded:

@mathlib-bors mathlib-bors bot changed the title fix: patch for std4#198 (more mul lemmas for Nat) [Merged by Bors] - fix: patch for std4#198 (more mul lemmas for Nat) Jan 11, 2024
@mathlib-bors mathlib-bors bot closed this Jan 11, 2024
@mathlib-bors mathlib-bors bot deleted the fgdorais-nat-mul branch January 11, 2024 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR has been sent to bors. t-algebra Algebra (groups, rings, fields etc) t-number-theory Number theory (also use t-algebra or t-analysis to specialize)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants