Suppose a merge conflict happens. There are two options shown the upper (in red) and the lower (in green):
I would like to avoid complex
ediff-mode stuff to pick one. I have seen some tutorial where the user would easily pick one of the them with a command. I believe it is a magit command.
What is the magit command to easily pick one of them?