You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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):
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
The text was updated successfully, but these errors were encountered:
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:
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 runjj log
first to figure out the short name of the change ID (or copy-paste the long name):Describe the solution you'd like
colorize change IDs in the "To resolve the conflicts" output.
Describe alternatives you've considered
Additional context
The text was updated successfully, but these errors were encountered: