While suggesting usability improvements, there is one thing which would help
the resolve command - after doing this from the command line you get the
file name info shown
c:\ws\jam\main.c - merging //depot/proj/jam/main.c#7
Diff chunks: 0 yours + 2 theirs + 0 both + 0 conflicting
and then the prompt:
Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) [at]:
The problem for me is that if you do one of the actions such as dt, then you
are shown the difference and reprompted. The problem is you only see the
prompt and the original filename info has usually scrolled off the screen.
It would be really helpful to have the filename info rewritten to the output
just before being prompted again - just as a reminder.
Anyone else found this?
Absolutely; I'd like to see both the filename and the "Diff chunks"
counts any time I see the prompt. I frequently find myself quitting
the resolve and restarting it just to get that information again.