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

conflicts: label closing delimeter with e.g. "Conflict 2 of 3 ends" #3724

Merged
merged 1 commit into from
May 21, 2024

Conversation

ilyagr
Copy link
Contributor

@ilyagr ilyagr commented May 21, 2024

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

  • I have added tests to cover my changes

Sorry, something went wrong.

@ilyagr ilyagr marked this pull request as ready for review May 21, 2024 01:14
@ilyagr ilyagr changed the title conflicts: end conflict description conflicts: label closing delimeter with e.g. "Conflict 2 of 3 ends" May 21, 2024
@ilyagr ilyagr force-pushed the endconflicts branch 2 times, most recently from 829008e to 486cd41 Compare May 21, 2024 01:17
This follows up on jj-vcs#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 now realizing that when I resolve conflicts, I usually go from top
to bottom. The first thing I do is delete the starting conflict
delimeter. It is when I get to the *end* of the conflict that I wonder
whether there are any more conflicts left in the file.
@ilyagr
Copy link
Contributor Author

ilyagr commented May 21, 2024

That was fast, thanks Austin!

@ilyagr ilyagr merged commit 1f7c4ec into jj-vcs:main May 21, 2024
16 checks passed
@ilyagr ilyagr deleted the endconflicts branch May 21, 2024 01:36
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.

None yet

2 participants