简体   繁体   English

git branch -a --no-merged master&'git branch -r'返回两台机器上不同的远程分支

[英]git branch -a --no-merged master & 'git branch -r' returns differnt remote branches on two machines

On a weekly basis on before we build our weekly package I run this command to see if there are any unmerged branches. 在构建每周软件包之前,每周运行一次此命令,以查看是否有未合并的分支。 I am mostly looking for branches on the remote/origin 我主要是在远程/原始站点上寻找分支机构

git branch -a --no-merged master

This week, the results that I get are missing branches that I know have been pushed back to the remotes/origin. 这周,我得到的结果缺少我知道已经推回远程/起源的分支。 If another delveloper runs this same command he sees the missing branches from remotes/origin. 如果另一个delveloper运行相同的命令,他会从远程控制器/原点看到丢失的分支。 I also have a second copy of repository on my unix share and that one works fine too. 我的unix共享上还有第二个版本库,这个版本也可以正常工作。

I noticed a similar problems with 我注意到类似的问题

 git branch -r

Based on what I see in the git log my repository is up to date. 根据我在git日志中看到的信息,我的存储库是最新的。 The branches that are missing are a few weeks old. 缺少的分支已有几个星期的历史了。 Is there something else that would keep this from being up to date? 还有其他事情可以阻止它更新吗?

This actually turned out to be some issue on how the commit was pushed to the origin. 实际上,这实际上是关于如何将提交推送到原始位置的一个问题。 I had original developer try to merge his changes from the remote and though he saw a reference to the remote commit the merge failed. 我让原始开发人员尝试从远程合并他的更改,尽管他看到对远程提交的引用,但合并失败。 I will chaulk this up to some other git error. 我会将此问题归结为其他一些git错误。

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

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