使用git flow和azure管道设置拉取请求 [英] Setup pull requests with git flow and azure pipelines

问题描述

我正在尝试使用DevOps设置一个库项目.选择的分支策略是 git-flow ，以便使用git版本并紧随semver的发行版和修补程序.

I'm trying to setup a library project using DevOps. The branching strategy choosed is git-flow in order to have use git version and follow semver with releases and hotfixes.

所以我试图通过激活请求请求来保护开发分支和发布分支.

So i tried was to protect both develop and release branches by activating pull requests.

一切正常，除非要关闭发行版.在这里，我看到两个问题:

Everything works fine unless a release is going to be closed. Here I see two problems:

1. 在git-flow中，系统尝试从master重新调整开发，但是devops不知道这是git-flow，只是将发行版合并到master.
2. Develop分支受到保护，因此，如果我要手动重新对齐，我应该创建一个新的请求请求，从master分支到Feature分支，以解决冲突

我不确定所实施的工作流程是否正确.有没有更好的方法来完成此调整?

I'm not sure about the correctnes of the implemented workflow. Is there a better way to accomplish this realignment?

欢迎任何建议

谢谢

推荐答案

目前，天蓝色的devops就是这样设计的. Devops只能同时进行一对一的分支合并.release分支不能同时合并到master分支和develop分支中.

At present, azure devops is designed like this. Devops can only be one-to-one branch merge at the same time.The release branch cannot be merged into the master branch and into the develop branch at the same time.

发行完成后，发行分支将合并到母版中 并开发，以确保 发行分支不会因新开发而意外丢失.

When the release is finished, the release branch is merged into master and into develop too, to make sure that any changes made in the release branch aren’t accidentally lost by new development.

在git flow中描述的此功能无法在天蓝色的Devops中实现.

This feature described in git flow cannot be implemented in azure Devops.

因此，您的理解是正确的，尽管这可能有点不方便，但是您可以通过您的方法手动进行操作.

So, your understanding is correct, you can do it manually by your method, although this may be a bit inconvenient.

这篇关于使用git flow和azure管道设置拉取请求的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！