Git获取和合并不会更新子树

时间:2019-07-10 17:30:03

标签: git

我有一个带有子树的项目。我正在尝试从GitHub存储库更新子树,但是它不起作用。子树的名称是“ oess”。这是我尝试过的:

head(df.1)
          V1         v2 CHR
1 -1.3545128  0.8267013   1
2  0.3758215 -0.4475770   1
3  0.5209901 -1.1342161   1
4  0.7207743 -1.4273951   1
5 -0.3867220  0.2681198   1
6  1.3279556  0.6116999   1

我通过与GitHub存储库中的master分支进行比较,验证了更新了子树mcast_lib / OESS-Client中的文件。

我在做什么错了?

其他信息:

$ git fetch oess
X11 forwarding request failed on channel 0
remote: Enumerating objects: 212, done.
remote: Counting objects: 100% (210/210), done.
remote: Compressing objects: 100% (141/141), done.
remote: Total 202 (delta 96), reused 153 (delta 57), pack-reused 0
Receiving objects: 100% (202/202), 45.05 KiB | 0 bytes/s, done.
Resolving deltas: 100% (96/96), done.
From github.com:UVA-High-Speed-Networks/OESS-Client
 * [new branch]      master     -> oess/master
$ git merge -X subtree=mcast_lib/OESS-Client --squash oess/master
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
$ 

0 个答案:

没有答案