简体   繁体   English

Atlassian Stash表示第二次拉取请求是远程合并的

[英]Atlassian Stash says that the second pull request merged remotely

There were 2 different pull requests: A and B. When the A pull request has been merged into master in Stash, Stash shows that pull request B has been merged remotely (but it didn't!). 有两个不同的拉取请求:A和B.当A拉请求已经合并到Stash中的master时,Stash显示拉取请求B已被远程 合并 (但它没有!)。 Somehow it worked automatically. 它以某种方式自动运作。 There are no hooks. 没有钩子。

I tried running: 我试过跑:

git log --merges

But I can't see the merge commit for B. 但我看不到B的合并提交

Can you please help? 你能帮忙吗?

The git tree is as follows: git树如下:

*   c8372e0 (HEAD, master) Merge branch 'master' of http://...
|\
| *   b091241 (origin/master, origin/HEAD) Merge pull request #193 in ...
| |\
| | * 629fb1f (origin/feature/A Fix
...
| | * e9042fb (origin/feature/B) 
| | *   d84a03c Merge branch 'master' into feature/B

I found the answer: 我找到了答案:

Branch A was created not from a master but from branch B. When A's pull request is merged, B is merged as well automatically. 分支A不是从主服务器创建的,而是从分支B创建的。当A的pull请求合并时,B也会自动合并。

The reason: They have the same parent 原因是:他们有同一个父母

You can check it with git command to find a common ancestor of two commits , eg: 您可以使用git命令检查它以查找两个提交的共同祖先 ,例如:

git merge-base -a 629fb1f e9042fb

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

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