Details
-
Bug
-
Resolution: Fixed
-
Medium
-
4.0 RC1
-
None
-
Bamboo version 4.0-rc1 build 2906
Description
We merged from one branch into another and Bamboo got a bit confused about what changes are new:
AFAICT it should have shown 4 commits only:
jira50 (atlassian_jira_5_0_branch) $ git glog 8ca5907..9de34a2 --oneline * 9de34a2 (origin/atlassian_jira_5_0_SHIPIT_branch) fixing SHIP_IT branch to pick up REST change * 0fb6402 Merge remote-tracking branch 'origin/atlassian_jira_5_0_1_branch' into atlassian_jira_5_0_SHIPIT_branch * 3d719fc (origin/atlassian_jira_5_0_1_branch) AUTOCOMMIT update JIRA for next version 5.0.1-SNAPSHOT * d2a042e JRA-27419 Upgrade rest from 2.5.5-SEC2 to 2.5.5.1 (now in public mvn)
See the screenshots for the 2 relevant builds.