It appears the git-plugin is already capable of merging another branch into the current one. It is probably not designed for this purpose, but after digging into the source code i found it is possible.
In the merge before build step, the *Branch to merge to* can be specified. Here the branch to be integrated can be specified. In the git publisher the *Merge Results* checkbox indicates if the merge is to be pushed. It will than push to the branch which was merged, not to the current branch being build. Instead of checking the checkbox, *Branches to push to remote repositories *can be specified. If the current branch being build is specified here, the merge is pushed there. This usage may not be intuitive, but it is sufficient. Thanks, Hillebrand Op donderdag 30 juli 2015 09:15:35 UTC+2 schreef [email protected]: > > Hi all, > > I made some minor modifications to the merge before build feature of the > git-plugin to merge from another branch into the current and push the merge > result to the current branch after the build is completed. I created a pull > request <https://github.com/jenkinsci/git-plugin/pull/332> on june 25th, > but it has been quite since. > > It is not a major change and it has good test coverage, so i think it can > be merged in absence of a review. Can i get commit access to the git-plugin > repository? My GitHub accountname is hillebrand. > > > > Regards > , > > > > Hillebrand Gelderblom > -- You received this message because you are subscribed to the Google Groups "Jenkins Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-dev/d71b923f-a0be-4cfc-a899-c03c6b16ff41%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
