Details
-
Bug
-
Resolution: Tracked Elsewhere
-
Medium
-
None
-
2.4.2
Description
The setup:
1) Bamboo is set to auto-detect Git branches and clone the build plan.
2) Branches are set to auto-merge 'master' into the feature branch.
3) Stash is setup to require at least 1 successful build before a Pull Request merge is allowed.
The problem:
1 - Developer pushes changes to their branch ("Feature B")
2 - Bamboo kicks off a build. First it auto-merges changes from 'master' into branch "Feature B".
3 - Tests run. Build completes successfully and is green. Bamboo pushes the merge back on to "Feature B" branch.
4 - From Stash, create a Pull Request to merge "Feature B" into "master"
5 - "Merge" button is disabled with a warning that "You need a minimum of one successful build before this pull request can be merged."
6 - From Bamboo, you now need to run another (redundant) build in order to activate the "Merge" button in the pull request.
It seems that Bamboo pushing the auto-merge throws Stash off and makes it think there wasn't a green build since the last commit.
It's very annoying to have to trigger a redundant build if an auto-merge takes place just to get the 'merge' button activated.