> And the only effect to have the "--ff-one-only" option is to allow > you *not* to look at what is on the side branch. Moreover, it allows not to forget choose the right way and allow use a lot of external tools (GitExtensions for example) as not all in command are console ninja Currently, when complex features merged with --ff accidentally we have to do in main branch something like $ git reset ... $ git checkout <some_old_commit_which_we_have_to_find> $ git merge --no-ff <latest commit> $ git push --force And that's what I prefer to avoid -- Ruslan
