简体   繁体   English

SourceTree:为什么分支没有显示为合并?

[英]SourceTree: Why aren't branches showing as merged?

Can you help me understand - after merging 'release/1.0.0' into 'master' why they dont show as merged in the SourceTree graph?你能帮我理解 - 在将“release/1.0.0”合并到“master”之后,为什么它们在 SourceTree 图中没有显示为合并?

I did the merge via a Pull Request using Microsoft DevOps我使用 Microsoft DevOps 通过拉取请求进行了合并

Then checked out 'master' locally and did a Pull - this is what the graph shows now:然后在本地签出“master”并进行了拉取——这就是图表现在显示的内容:

SourceTree 分支图

There are four ways to "merge" a pr on DevOps, according to the documentation:根据文档,有四种方法可以在 DevOps 上“合并”一个 pr:

  • Merge (no fast forward) : Merge with a non-linear history that preserves all commits.合并(无快进) :与保留所有提交的非线性历史合并。
  • Squash commit : Merge with a linear history that combines all source commits into a single commit on the target, or squash merges the PR. Squash commit :与线性历史合并,将所有源提交合并为目标上的单个提交,或者 squash 合并 PR。
  • Rebase and fast-forward : Rebase the source commits onto the target and fast-forward.变基和快进:将源提交变基到目标上并快进。
  • Semi-linear merge : Rebase source commits onto the target and create a two-parent merge.半线性合并:将源提交重新定位到目标并创建双父合并。

Only two of those (with "merge" in their name) make a merge commit.其中只有两个(名称中带有“合并”)进行合并提交。 You probably did one of the others.你可能做了其他之一。 My guess is that you did a squash.我的猜测是你做了一个壁球。

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM