If the merge fails, you might see the following message in the console (accumulated strategy):

Failed to merge changes.
merge: failure - not something we can merge

The first line comes from our plugin, and second one comes from git and is the reason why the merge fails.
This isn't obvious.