@dump_stack merge --ff-only if possible, if not rebase