Skip to content

Commit ff4b4b1

Browse files
committed
use branch names, not actual ref
1 parent a6d0808 commit ff4b4b1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Feature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Feature {
122122
cancelDevelopMerge = isSameCommit || isRebase;
123123

124124
if (!cancelDevelopMerge) {
125-
return Promise.resolve(beforeMergeCallback(developBranch, featureBranch))
125+
return Promise.resolve(beforeMergeCallback(developBranchName, featureBranchName))
126126
.then(() => utils.Repo.merge(developBranch, featureBranch, repo, processMergeMessageCallback))
127127
.then(utils.InjectIntermediateCallback(postMergeCallback));
128128
} else if (isRebase && !isSameCommit) {

0 commit comments

Comments
 (0)