Fixed issue #1886: Fetch&Rebase should allow automatic branch update if FF

Talking too far. Back to the original topic:
I think merge/rebase/cherry pick are kind of MERGE.
They might be get into conflict or not.
It should be only one unified method to deal with MERGE or conflicts.
Do I think things too simple?