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

FR: highlight change ids in rebase advice #3561

Open
jyn514 opened this issue Apr 23, 2024 · 0 comments
Open

FR: highlight change ids in rebase advice #3561

jyn514 opened this issue Apr 23, 2024 · 0 comments
Labels
polish🪒🐃 Make existing features more convenient and more consistent

Comments

@jyn514
Copy link
Collaborator

jyn514 commented Apr 23, 2024

Is your feature request related to a problem? Please describe.
when i rebase, i want to be easily resolve the conflicts. jj shows some helpful advice for this:

To resolve the conflicts, start by updating to the first one:
  jj new vwymzkuxkvrw
Then use `jj resolve`, or edit the conflict markers in the file directly.
Once the conflicts are resolved, you may want inspect the result with `jj diff`.
Then run `jj squash` to move the resolution into the conflicted commit.

however, unlike most of jj's output, the change IDs are not colorized, which means i can't just type jj new u; i have to run jj log first to figure out the short name of the change ID (or copy-paste the long name):
image

Describe the solution you'd like
colorize change IDs in the "To resolve the conflicts" output.

Describe alternatives you've considered

Additional context

jj 0.16.0
@PhilipMetzger PhilipMetzger added the polish🪒🐃 Make existing features more convenient and more consistent label Apr 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
polish🪒🐃 Make existing features more convenient and more consistent
Projects
None yet
Development

No branches or pull requests

2 participants