Ignore superfluous command options (but print a warning)
Merge remote-tracking branch 'origin/develop' into develop