From d2498b699e1071146a3ca907d5852e589029575a Mon Sep 17 00:00:00 2001
From: rkiel <cygnus@pobox.com>
Date: Tue, 28 May 2019 22:43:08 -0400
Subject: [PATCH] feature: handle merge conflicts on the feature branch not
 master

---
 lib/feature/merge.rb | 4 ++++
 1 file changed, 4 insertions(+)

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