- edited description
Merge commit with changes from master into a feature branch are rejected
Issue #1
resolved
The merge commit has 2 parents: p1 is from a commit from master and p2 is from an unpublished commit from the feature branch.
git branch --contains p1
master
git branch --contains p2
<nothing>
The hook should take into account the destination branch or the source of the commit. Right now it only looks at the distinct list of results from "git branch --contains" which doesn't provide enough information to allow this type of merge commit.
A workaround is to push all the commits from the feature branch first, then push the merge commit.
Comments (3)
-
reporter -
reporter - changed status to resolved
Fix Bug
#1Include the destination branch when identifying merge commit parents.
→ <<cset aaed4787c7f5>>
-
reporter - Log in to comment