Merge option suggestion (dictator, humble)

Hi,

I would like to suggest 2 merge options --dictator use all my changes --humble use all their changes

These allows to produce a fast-forward commit, without resolving any conflicts. Sometimes, someone did something completely wrong, so the commit needs to be ignored. I cannot tell everyone in the world to run git fetch followed by git reset --hard.

Regards,

ch3cooli