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] - feat: port Analysis.Calculus.Deriv.Support #4442

Closed
wants to merge 3 commits into from

Conversation

urkud
Copy link
Member

@urkud urkud commented May 28, 2023


Github shows Deriv.Basic as a part of this PR. In fact, the first commit in the history is already in master. I don't know how to fix this. Please ignore that file.

Open in Gitpod

@semorrison
Copy link
Contributor

This PR/issue depends on:

@urkud urkud added awaiting-review The author would like community review of the PR mathlib-port This is a port of a theory file from mathlib. labels May 28, 2023
@ChrisHughes24
Copy link
Member

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 May 28, 2023
@urkud
Copy link
Member Author

urkud commented May 28, 2023

Avoiding merge conflicts on the queue:
bors r-

@bors
Copy link

bors bot commented May 28, 2023

Canceled.

@fpvandoorn
Copy link
Member

Interesting that Basic is shown in the files changed tab. Note that it shows the diff correctly here:
https://github.com/leanprover-community/mathlib4/compare/port/Analysis.Calculus.Deriv.Support

@semorrison semorrison added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label May 28, 2023
@urkud
Copy link
Member Author

urkud commented May 28, 2023

@fpvandoorn I rebased on origin/staging before that commit was merged. Probably, this was a bad idea.

urkud added 3 commits May 28, 2023 19:52
Mathbin -> Mathlib
fix certain import statements
move "by" to end of line
add import to Mathlib.lean
@urkud urkud force-pushed the port/Analysis.Calculus.Deriv.Support branch from 8ff22c5 to 090a33e Compare May 29, 2023 00:53
@urkud
Copy link
Member Author

urkud commented May 29, 2023

bors merge

@bors
Copy link

bors bot commented May 29, 2023

👎 Rejected by label

@urkud urkud removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label May 29, 2023
@urkud
Copy link
Member Author

urkud commented May 29, 2023

bors merge

bors bot pushed a commit that referenced this pull request May 29, 2023
@bors
Copy link

bors bot commented May 29, 2023

Pull request successfully merged into master.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot changed the title feat: port Analysis.Calculus.Deriv.Support [Merged by Bors] - feat: port Analysis.Calculus.Deriv.Support May 29, 2023
@bors bors bot closed this May 29, 2023
@bors bors bot deleted the port/Analysis.Calculus.Deriv.Support branch May 29, 2023 01:13
qawbecrdtey pushed a commit to qawbecrdtey/greedoid-mathlib4 that referenced this pull request Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mathlib-port This is a port of a theory file from mathlib. ready-to-merge This PR has been sent to bors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants