Question

我有这个有趣的链接http://nvie.com/posts/a-successful-git-branching-model/ 所以我对此有疑问：

如何初始化＆＃34;起源＆＃34;回购（作为裸）或工作分支？

您何时进行最终整合？如果原点是一个裸仓库，那么我需要在本地分支上进行，然后将其推送到公共（裸）仓库？

祝你好运，彼得

Answer 1

如果您打算将它用作服务器，那么它应该是Bare。所以你可以从那里推送和拉动变化和分支。

如果它不是裸露的，你会收到这样的消息，解释为什么它应该裸露：

  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'

git工作流模型＆amp;分枝

1 个答案: