从主合并到分支

本文介绍了从主合并到分支-Git/Jenkins的处理方法，对大家解决问题具有一定的参考价值，需要的朋友们下面随着小编来一起学习吧！ 问题描述

我正在寻找一种自动将Master分支合并到一个或多个开发分支的方法.换句话说，我想在多个项目中每天将团队开发部门与Master同步.

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.

我一直在考虑使用Jenkins，但经验不足. Jenkins是否可以通过添加多个存储库URL，然后在配置中指定合并到的分支"来提供此功能?与合并问题相比，我不太关心项目的构建.詹金斯对失败的合并有何反应?

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.

非常感谢.

推荐答案

我强烈建议让负责分支的开发人员执行此操作，例如:

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

• 如果没有冲突，这样的合并需要10到30秒的时间
• 如果有冲突，那么知道如何解决冲突的人就在那里
• 您的开发人员最清楚何时进行合并

为什么首先要自动化呢?

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