How to resolve commit conflicts when options: Resolve conflict using mine and Resolve conflict using theirs. do not appear?

0
When I right-click on the changes, I only get the Go To option.      
asked
1 answers
0

If you go back to the changes overview (without looking at the details), you can right-click the conflict and resolve it with either mine or theirs.

answered