Where is the merge dialog when you need it?

Question

I checked some files to write code. When I finished, I got to the last check-in.

There were conflicts when receiving the latter, but I did not have a merger dialogue, as I was used to previous jobs.

This time I got an output message:

A warning. Unable to update {file} because you have pending editing.

Is there a parameter that I'm missing or something else?

Answer 1

Merging is available on the Conflicts tab of the Pending Changes window.