Unify merge_strategy decision logic in branch.rb
Fix specs
merge in latest changes from add_rebase_option