Zulip Chat Archive
Stream: nightly-testing
Topic: nightly#56 adaptations for nightly-2025-09-05
github mathlib4 bot (Sep 05 2025 at 10:54):
chore: adaptations for nightly-2025-09-05 nightly#56 Please review this PR. At the next toolchain release this diff will land in 'master'.
Kevin Buzzard (Sep 06 2025 at 10:52):
Hmm, I just merged nightly#53. Was that unwise? Will this now pick up a conflict? It's fine to merge
Robin Arnez (Sep 06 2025 at 11:26):
I think we only had toolchain changes the last two days, so this will just become a trivial change after the merge
Kevin Buzzard (Sep 07 2025 at 12:47):
Well it picked up conflicts unfortunately, and I don't know enough about the system behind what these PRs are doing to do next. I think what I've learnt is to not merge nightly#n if nightly#(n+1) has appeared.
Kim Morrison (Sep 08 2025 at 00:09):
The procedure now is:
git checkout bump/v4.24.0
git pull
git checkout bump/nightly-2025-09-05
git merge bump/v4.24.0
git push
(resolving conflicts as needed at the merge step).
Kim Morrison (Sep 08 2025 at 00:11):
(with the additional note that it doesn't matter how you merge conflicts in lake-manifest.json, just run lake update afterwards)
Kim Morrison (Sep 08 2025 at 00:13):
(Done: the diff is now just lean-toolchain and lake-manifest.json, so I have bors merged.)
Last updated: Dec 20 2025 at 21:32 UTC