logburn/git-utilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit d2498b699e.
This commit is contained in:
rkiel
2019-06-03 08:09:02 -04:00
parent d2498b699e
commit c3079f1e1e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/feature/merge.rb
View File

@@ -28,10 +28,6 @@ module Feature
# should match rebase # should match rebase
git_fetch git_fetch
git_checkout standard_branch
git_merge ['origin', standard_branch].join('/')
git_checkout feature_branch
git_rebase ['origin', standard_branch].join('/') git_rebase ['origin', standard_branch].join('/')
if remote_branch != "" if remote_branch != ""
git_remote_branch_delete feature_branch git_remote_branch_delete feature_branch