Fix empty conflict explanations #4982
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kit-ty-kate
commented
Jan 5, 2022
kit-ty-kate
force-pushed
the
fix-empty-conflict-explain
branch
2 times, most recently
from
eb5eef5
to
626d140
Compare
AltGr
reviewed
Jan 6, 2022
| let dsc = match Hashtbl.length missing with | ||
| | 0 -> ds | ||
| | _ -> ds %% all_conflicting | ||
| in |
There was a problem hiding this comment.
This feels a bit fragile; maybe we could at least check that there is no "missing" below p in the dep tree rather than in general ?
This said, it already avoids the very problematic issue of no messages at all, and thank you a lot for finding a workaround.
|
This may not be perfect, but already works around most problematic cases in practice, so I think it should be merged (once rebased). Thanks Kate! |
kit-ty-kate
force-pushed
the
fix-empty-conflict-explain
branch
from
626d140
to
64cf433
Compare
kit-ty-kate
force-pushed
the
fix-empty-conflict-explain
branch
from
64cf433
to
7ccbbcd
Compare
kit-ty-kate
force-pushed
the
fix-empty-conflict-explain
branch
from
7ccbbcd
to
98c8ad8
Compare
rjbou
pushed a commit
to rjbou/opam
that referenced
this pull request
Apr 22, 2022
…lain Fix empty conflict explanations
rjbou
pushed a commit
to rjbou/opam
that referenced
this pull request
Apr 22, 2022
…lain Fix empty conflict explanations
rjbou
pushed a commit
to rjbou/opam
that referenced
this pull request
Apr 27, 2022
…lain Fix empty conflict explanations
rjbou
pushed a commit
to rjbou/opam
that referenced
this pull request
Jul 12, 2022
…lain Fix empty conflict explanations
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4373