List conflicts - label + classify conflicts #84
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
olsen232
force-pushed
the
list_conflicts
branch
2 times, most recently
from
2b5e8cc to
5745e45
Compare
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.
The beginnings of a (not yet existent) command to list all conflicts, in a format of your choice. So far, still only supports showing summaries of conflicts, but classifying conflicts and naming conflicts is much more rigorous. Summarising conflicts can now use the same code that will generate full diffs of conflicts, so naming and categorising will be consistent.
Output of
sno mergeis now switched to use this new code.