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

Adapt to coq/coq#18973. #778

Merged
merged 3 commits into from
Jun 18, 2024
Merged

Adapt to coq/coq#18973. #778

merged 3 commits into from
Jun 18, 2024

Conversation

rlepigre
Copy link
Contributor

@rlepigre rlepigre commented Jun 3, 2024

No description provided.

@rlepigre rlepigre mentioned this pull request Jun 3, 2024
4 tasks
@rtetley
Copy link
Collaborator

rtetley commented Jun 5, 2024

Thanks !

@rlepigre
Copy link
Contributor Author

rlepigre commented Jun 8, 2024

@rtetley I had to rebase, I'm not sure what your flake.lock changes were about, but I had to drop them due to conflicts.

@rtetley
Copy link
Collaborator

rtetley commented Jun 10, 2024

Ah sorry, that was probably a mistake...

@proux01
Copy link
Contributor

proux01 commented Jun 14, 2024

Upstream merged, please merge

@rtetley
Copy link
Collaborator

rtetley commented Jun 14, 2024

There is a release in progress, I will merge as soon as that is done.

@SkySkimmer
Copy link
Contributor

ping @rtetley @gares

@gares
Copy link
Member

gares commented Jun 18, 2024

@rtetley I believe you did block this branch for a reason. Can we release the lock and merge?

@rtetley
Copy link
Collaborator

rtetley commented Jun 18, 2024

I was waiting for ocaml/opam-repository#26087 so that I can finalise the release process but after double checking I can unlock and perform the action from the tag later

Co-Authored-By: Romain Tetley <romain.tetley@inria.fr>
@rtetley
Copy link
Collaborator

rtetley commented Jun 18, 2024

Ugh sorry I used the github interface to resolve a conflict which led to a merge of main into this branch... I preferred to fix it with a rebase

@rtetley rtetley merged commit 2918fb0 into coq:main Jun 18, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants