Unify merge_strategy decision logic in branch.rb
Merge branch 'add_rebase_option' into integration_jonk