Let's say I have a merge conflict. I see a conflicted file like this:
Unstaged changes: Unmerged Foo/bar/wibble/plop/elbow.txt
I can hit tab here to open the changes and maybe jump to a point inside the file to fix by hand, but if it's a big file with lots of conflicts that can be time consuming.
How can I ask git, through magit, to checkout the ours or theirs version of the file, to resolve the conflict? I can copy the path, then use
Shift-: to enter a custom git command, but it seems like there must be a keyboard shortcut for this. I can't see anything obvious in the magit menu or the