conflicts: label closing delimeter with e.g. "Conflict 2 of 3 ends" #3724
+49
−46
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.
This follows up on #3459 and adds a label to the closing delimeter of each conflict, e.g. "Conflict 1 of 3 ends".
I didn't initially put any label at the ending delimeter since the
starting delimeter is already marked with "Conflict 1 of 3". However,
I'm realizing that when I resolve conflicts, I usually go from top to
bottom and removing the first delimeter is the very first thing I do. It
is when I get to the end of the conflict that I wonder whether there
are any more conflicts left in the file.
Checklist