2012-02-14 96 views
0

我有這個有趣的鏈接http://nvie.com/posts/a-successful-git-branching-model/ 所以我有一個關於它的問題:git的工作流模型及分支

如何初始化「原點」回購(裸露)或工作的分支?

你什麼時候做最終整合?如果起源是一個裸回購,那麼我需要在本地分公司做到這一點,然後將其推到公共(裸)回購?

最好的問候, 彼得

+1

你的問題實在是混亂對我來說,目前還不清楚你在問什麼。 – Ikke 2012-02-14 12:15:40

+1

如何創建「原點」? – Pepe 2012-02-14 12:39:34

+0

「origin」存儲庫通常意味着一個遠程git服務器,您將推送提交和分支。你想知道如何設置一個git服務器嗎? – 2012-02-14 12:46:35

回答

0

如果你打算使用它作爲服務器應該是光禿禿的。所以你可以從那裏推動和改變變化和分支。

如果不是裸露,你會收到類似這樣的消息,解釋爲什麼它應該是裸:

Counting objects: 3, done. 
    Delta compression using up to 2 threads. 
    Compressing objects: 100% (2/2), done. 
    Writing objects: 100% (2/2), 239 bytes, done. 
    Total 2 (delta 0), reused 0 (delta 0) 
    Unpacking objects: 100% (2/2), done. 
    remote: error: refusing to update checked out branch: refs/heads/master 
    remote: error: By default, updating the current branch in a non-bare repository 
    remote: error: is denied, because it will make the index and work tree inconsistent 
    remote: error: with what you pushed, and will require 'git reset --hard' to match 
    remote: error: the work tree to HEAD. 
    remote: error: 
    remote: error: You can set 'receive.denyCurrentBranch' configuration variable to 
    remote: error: 'ignore' or 'warn' in the remote repository to allow pushing into 
    remote: error: its current branch; however, this is not recommended unless you 
    remote: error: arranged to update its work tree to match what you pushed in some 
    remote: error: other way. 
    remote: error: 
    remote: error: To squelch this message and still keep the default behaviour, set 
    remote: error: 'receive.denyCurrentBranch' configuration variable to 'refuse'. 
    To /Users/flores/Code/git-test 
    ! [remote rejected] master -> master (branch is currently checked out) 
    error: failed to push some refs to '/Users/flores/Code/git-test' 
+0

我明白了。非常感謝! – Pepe 2012-02-14 14:09:34

+0

如果它是「光禿禿的」回購,所以我可以在那裏做分支(裸回購)。我可以切換分支嗎?切換它們有意義嗎? 其他問題:如果我明白我不能在工作樹上使用裸回購。所以我需要在本地進行發佈,修復等操作,然後將其推向裸回購。這是對的嗎? – Pepe 2012-02-14 14:15:10

+0

正確。裸存儲庫不是開發存儲庫,只是用於獲取和推送更改的存儲庫。 – 2012-02-14 17:03:40