cli: status: when current change has conflicts, display instructions to resolve them #3190
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
poliorcetics
added
enhancement
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
2 times, most recently
from
f506365
to
97dae12
Compare
martinvonz
reviewed
Mar 3, 2024
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
3 times, most recently
from
bb0942d
to
69a1ca4
Compare
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
2 times, most recently
from
d8ad8b1
to
5e796eb
Compare
bnjmnt4n
reviewed
Mar 13, 2024
martinvonz
approved these changes
Mar 14, 2024
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
2 times, most recently
from
280336b
to
5efaa63
Compare
|
I marked all comments as resolved since I changed the implementation a lot: it now searches for the conflicts roots and says to |
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
from
5efaa63
to
cd7b8c2
Compare
martinvonz
reviewed
Apr 9, 2024
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
from
cd7b8c2
to
7a0b032
Compare
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
2 times, most recently
from
bf05957
to
1193c0f
Compare
|
Can you remind me of the status of this PR? I see that I approved it a long time ago. Why have you not merged it yet (I don't mean that in an accusatory way)? Was there some discussion here or on Discord that I've forgotten? |
|
I forgot to merge it for a long time and now tests are broken, I'm fixing right now |
poliorcetics
force-pushed
the
ab/push-vqytsmpzknyk
branch
from
1193c0f
to
7b8efb4
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.
Fixes #3108
Example output (which takes into account my own jj config and PWD so it's a little wonkier than the test, the screen is to show colors):
Checklist
If applicable:
CHANGELOG.mdI don't know if this deserves a changelog entry ? It's a small polish thing