我一直在閱讀Pro Git,我想我應該怎麼做。但是我之前可能會對我的忽略做出一些奇怪的調整,也許egit會對導致eclipse崩潰或者我錯過某些東西的回購時間進行不完整的更改。我現在放棄使用git從cmd行上的egit &。Git使用遠程合併
我試圖從遠程合併,我得到如下結果:
[[email protected] justifventures-opentaps]# git remote -v
origin http://git.gitorious.org/opentaps/opentaps.git (fetch)
origin http://git.gitorious.org/opentaps/opentaps.git (push)
[[email protected] justifventures-opentaps]# git remote show
origin
[[email protected] justifventures-opentaps]# git remote show origin
* remote origin
Fetch URL: http://git.gitorious.org/opentaps/opentaps.git
Push URL: http://git.gitorious.org/opentaps/opentaps.git
HEAD branch: master
Remote branches:
1.5M1 new (next fetch will store in remotes/origin)
dataimport new (next fetch will store in remotes/origin)
master new (next fetch will store in remotes/origin)
upgrade-1.5 new (next fetch will store in remotes/origin)
Local ref configured for 'git push':
master pushes to master (local out of date)
[[email protected] justifventures-opentaps]# git merge origin/master
fatal: 'origin/master' does not point to a commit
[[email protected] justifventures-opentaps]#
一個令我擔心的是,這個遙控器suppossed爲只讀的東西,所以我不知道爲什麼會有的行:
origin http://git.gitorious.org/opentaps/opentaps.git (push)
此外,它說:
Local ref configured for 'git push': master pushes to master (local out of date)
我不知道這有什麼關係與問題。我嘗試刪除遙控器並再次添加它們,但此配置似乎是相同的。
希望有更多經驗的人可以對我的困惑有所瞭解。
你有沒有做「git遠程更新」呢? – 2011-03-09 18:39:09
你能告訴我們'git branch -a'的輸出嗎? – nickgrim 2011-03-09 19:09:39