Skip to content

chore: bump to nightly-2023-08-17#190

Merged
digama0 merged 20 commits intoleanprover-community:mainfrom
kim-em:simp_failIfUnchanged
Aug 17, 2023
Merged

chore: bump to nightly-2023-08-17#190
digama0 merged 20 commits intoleanprover-community:mainfrom
kim-em:simp_failIfUnchanged

Conversation

@kim-em
Copy link
Copy Markdown
Collaborator

@kim-em kim-em commented Jul 20, 2023

@kim-em kim-em added the depends on core changes This PR need only be reviewed after changes land in Lean core. label Aug 8, 2023
@kim-em kim-em changed the title chore: adapt to simp failing if it makes no progress chore: bump to nightly-2023-08-17 Aug 17, 2023
@kim-em kim-em added awaiting-review This PR is ready for review; the author thinks it is ready to be merged. and removed depends on core changes This PR need only be reviewed after changes land in Lean core. labels Aug 17, 2023
@digama0
Copy link
Copy Markdown
Member

digama0 commented Aug 17, 2023

the PR has stuff from other PRs in it, looks like a botched merge

@eric-wieser
Copy link
Copy Markdown
Member

See this zulip thread for discussion about the accidental rebases.

@eric-wieser
Copy link
Copy Markdown
Member

Using git rebase to remove four of the last 5 commits seems to do the job.

@kim-em kim-em requested a review from digama0 August 17, 2023 11:00
@digama0 digama0 merged commit 49353fa into leanprover-community:main Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

awaiting-review This PR is ready for review; the author thinks it is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants