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

feature: handle merge conflicts on the feature branch not master

Browse Source
This commit is contained in:
rkiel
2019-05-28 22:43:08 -04:00
parent 01f3712085
commit d2498b699e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/feature/merge.rb
View File

@@ -28,6 +28,10 @@ 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