半线性合并 [英] Semi linear merge

问题描述

I just noticed in Azure DevOps, there's this option called semi-linear merge. I was wondering what it does? Does it come between the merge strategy & rebase strategy (from the name semi-linear)? If so, what are the pros/cons?

Edit: From Microsoft Devblog I believe this option consist of 2 points:

1. Rebase the feature branch from the master/dev branch
2. Then merge the feature branch in the master/dev branch

But isn't that the merge strategy?

解决方案

Semi-linear merge
This strategy is the most exotic – it’s a mix of rebase and a merge. First, the commits in the pull request are rebased on top of the master branch. Then those rebased pull requests are merged into master branch. It emulates running git rebase master on the pull request branch, followed by git merge pr --no-ff on the master branch.

Some people think of this as the best of both worlds: individual commits are retained, so that you can see how the work evolved, but instead of just being rebased, a "merge bubble" is shown so that you can immediately see the work in each individual pull request.

Taken from Pull Requests with Rebase

这篇关于半线性合并的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！