我有一个名为"gempak-tables"的git子树模块,位于子目录"gempak/tables"中:
$ git config -l | grep -i gempak
remote.gempak-tables.url=git@github.com:Unidata/GEMPAK-Tables.git
remote.gempak-tables.fetch=+refs/heads/*:refs/remotes/gempak-tables/*
$
然而,我无法将更改推送到子树模块 GitHub 上:
$ git subtree push --prefix=gempak/tables gempak-tables master
git push using: gempak-tables master
X11 forwarding request failed on channel 0
To git@github.com:Unidata/GEMPAK-Tables.git
! [rejected] 89d8f94d010e6677f146608674cf7408eecb4a61 -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:Unidata/GEMPAK-Tables.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
$
即使子树模块似乎是最新的:
$ git subtree pull --prefix=gempak/tables gempak-tables master
X11 forwarding request failed on channel 0
From github.com:Unidata/GEMPAK-Tables
* branch master -> FETCH_HEAD
Already up-to-date.
$
我的 git(1) 版本:
$ git --version
git version 1.8.3.1
我是一位子树新手,请帮忙。
git subtree pull --prefix=gempak/tables gempak-tables master
吗? - phd