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

Fix all empty conflict messages #5263

Merged

Conversation

kit-ty-kate
Copy link
Member

@kit-ty-kate kit-ty-kate commented Aug 26, 2022

This PR simplifies the construction of ct_chains. This has several effects:

@kit-ty-kate kit-ty-kate added this to the 2.2.0~alpha milestone Aug 26, 2022
@kit-ty-kate kit-ty-kate force-pushed the fix-all-empty-conflict-messages branch 2 times, most recently from 6a7c2cf to 2f0a22a Compare August 31, 2022 13:13
@kit-ty-kate kit-ty-kate force-pushed the fix-all-empty-conflict-messages branch from 2f0a22a to fbf505f Compare September 1, 2022 16:15
@kit-ty-kate kit-ty-kate marked this pull request as draft September 9, 2022 17:15
@kit-ty-kate kit-ty-kate force-pushed the fix-all-empty-conflict-messages branch from fbf505f to 16ce5e6 Compare September 9, 2022 17:56
@kit-ty-kate kit-ty-kate marked this pull request as ready for review September 9, 2022 17:57
@rjbou rjbou requested a review from AltGr October 24, 2022 12:40
@kit-ty-kate kit-ty-kate merged commit 54a198b into ocaml:master Oct 25, 2022
@kit-ty-kate kit-ty-kate deleted the fix-all-empty-conflict-messages branch October 25, 2022 16:15
@rjbou
Copy link
Collaborator

rjbou commented Oct 25, 2022

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants