Redundant commands should not lead new commands to be ignored

[xmo-odoo]

Cf odoo/odoo#168908

r+ r+ rebase-ff

=> because the r+ is redundant / errorneous, the merge method is ignored. That probably shouldn't be the case, it's counter-productive.