-
Bug
-
Resolution: Won't Do
-
Critical
-
None
-
Jenkins: 2.60.1
Git Plugin: 3.3.1
Matrix Project 1.11
We use temporary integration branches for merges between 2 branches
I configured the pre build merge settings for the integ branch.
The integ branch was created off the dev branch so a merge from here would/should always be a fast forward merge and the second merge is just an a to b merge.
I ran into a couple of problems.
1) It needs to be able to configure the merge branch order.
No matter the branch order (or refspec* see below) in the config , it always selected the (wrong!) branch to merge first.
2) It needs to be able specify to do all the merges before building.
Since this is really an a to be merge, there should only be one build required.
Even better would be to pick where builds occur in a multi branch merge.
It looks like the current implementation does a build after every merge.
I am new to git but I am very old to merges.
If I missed (and trust me, I have) some glaring configuration setting, please let me know.
- Problems encountered configuring/build
We use matrix jobs for our builds.
When I added the build branches and built, it looks like the master job is sending the merge SHA to the axis children.
See JENKINS-23179
I then set the build branches back to the default '**' and changed the build refspec to only include those branches.
This is where I ran into the merge order problem.
Any questions, let me know.