feature: handle merge conflicts on the feature branch not master

2019-05-28 22:43:08 -04:00
parent 01f3712085
commit d2498b699e
1 changed files with 4 additions and 0 deletions
--- a/lib/feature/merge.rb
+++ b/lib/feature/merge.rb
@@ -28,6 +28,10 @@ module Feature

      # should match rebase
      git_fetch
+      git_checkout standard_branch
+      git_merge ['origin', standard_branch].join('/')
+      git_checkout feature_branch
+
      git_rebase ['origin', standard_branch].join('/')
      if remote_branch != ""
        git_remote_branch_delete feature_branch