Merge from master to branch - Git/Jenkins

Question

I am looking for a way to automate a merge from a Master branch to one or more development branches. In other words, I want to synchronise team development branches with Master daily across multiple projects.

I was looking into using Jenkins for this, but do not have much experience. Would Jenkins provide this functionality, perhaps by adding multiple repository URLs and then specifying the "branch to merge to" in the configuration? I am less concerned about the build of the project than merging issues. How would jenkins react to a failed merge?

Jenkins would be ideal, but if there is another approach I would love to hear it.

Many thanks in advance.

Answer 1

I would strongly propose to have the dev responsible for the branch do this, as:

• A merge like this takes 10-30 seconds if there are no conflicts
• If there are conflicts, the person who knows how to resolve them is right there
• Your devs know best when to do this merge

Why would you want to automate this in the first place?

Answer 2

I'd suggest using Gerrit to manage merges onto a common and shared workstream.

Gerrit can be configured to use Jenkins to verify each changeset proposed for review.