cli: print a message about new and resolved conflicts #2606
Conversation
There was a problem hiding this comment.
LGTM, it's only a missing a Fixes #555 in the commit message.
martinvonz
force-pushed
the
push-ryqxvrzulvxt
branch
3 times, most recently
from
e2c2001 to
587498d
Compare
That bug also mentioned divergent changes and conflicted branches. Perhaps it should have been 3 separate bugs. Maybe I'll close it and open new ones for the remaining bits once this is in. |
SGTM, as long as we close them when this lands. |
martinvonz
force-pushed
the
push-ryqxvrzulvxt
branch
3 times, most recently
from
6c6dd21 to
f69be88
Compare
|
I'll leave this until after the release on Wednesday since it's pretty large UX change and might have unknown rough edges. |
|
I'll probably merge this in a day or two if there are no further reviews |
martinvonz
force-pushed
the
push-ryqxvrzulvxt
branch
from
f69be88 to
74311a8
Compare
When e.g. `jj rebase` results in new conflicts, it's useful for the user to learn about that without having to run `jj log` right after. This patch adds reporting of new conflicts created by an operation. It also add reporting of conflicts that were resolved or abandoned by the operation. There was no measurable performance impact when rebasing a single commit in the Linux kernel repo.
This prints a hint about using `jj new <first conflicted commit>` and `jj squash` to resolve conflicts. The hint is printed whenever there are new or resolved conflicts. I hope this hint will be useful especially for new users so they know which commit to resolve conflicts in first. It may not be obvious that they should start with the bottommost one. I hope the hint will also be useful for more more experienced user by letting them just copy the printed command without first running `jj log` to find the right commit..
martinvonz
force-pushed
the
push-ryqxvrzulvxt
branch
from
74311a8 to
b8bae17
Compare
Checklist
If applicable:
CHANGELOG.md