When I merge 2 Git branches in PhpStorm I often have conflicts. After the merge the conflicted filenames show in red and I see Git's tabs in the file (eg "<<<<<<< HEAD").
In pretty much all cases I want to accept the version of the file from the branch I am mergeing from ("accept theirs").
I've tried following the instructions here: http://www.jetbrains.com/phpstorm/webhelp/resolving-conflicts.html , but I can't figure them out. I can't even figure out how I get this merge tool to appear.
I'm sure I'm missing something obvious somewhere... can someone help please?