From c3079f1e1e4b0aa98222a33a9f0e07772d43032e Mon Sep 17 00:00:00 2001
From: rkiel <cygnus@pobox.com>
Date: Mon, 3 Jun 2019 08:09:02 -0400
Subject: [PATCH] Revert "feature: handle merge conflicts on the feature branch
 not master"

This reverts commit d2498b699e1071146a3ca907d5852e589029575a.
---
 lib/feature/merge.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/feature/merge.rb b/lib/feature/merge.rb
index b9dfeab..805931c 100644
--- 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