Revert "feature: handle merge conflicts on the feature branch not master"

This reverts commit d2498b699e.
2019-06-03 08:09:02 -04:00
parent d2498b699e
commit c3079f1e1e
1 changed files with 0 additions and 4 deletions
--- a/lib/feature/merge.rb
+++ b/lib/feature/merge.rb
@@ -28,10 +28,6 @@ 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