git - 半线性 merge

Question

我刚刚在Azure DevOps中注意到，有一个称为semi-linear merge的选项。我想知道它做什么？它是否介于 merge 策略和 rebase 策略之间(从名称上是半线性的)？如果是这样，优点/缺点是什么？



编辑:
从Microsoft Devblog中，我相信此选项包括2点:

从master/dev分支

重新设置功能分支

然后将功能分支 merge 到master/dev分支

中

但这不是 merge 策略吗？

Answer 1

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.

取自Pull Requests with Rebase