How to interactively (visually) resolve conflicts in SourceTree / git

Question

I\'m using (Windows) SourceTree for my git project. I can do it in either command prompt or Linux terminal.

But, I\'m wondering whether there is a nice way to intera

Answer 1

When the Resolve Conflicts->Content Menu are disabled, one may be on the Pending files list. We need to select the Conflicted files option from the drop down (top)

hope it helps