2 commits

Author	SHA1	Message	Date
Martin von Zweigbergk	a88b3dd2f5	cli: print a hint about how to resolve conflicts ... 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..	2023-12-10 12:44:57 -08:00
Martin von Zweigbergk	2dae5f58dd	cli: print a message about new and resolved conflicts ... 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.	2023-12-10 12:44:57 -08:00