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