Есть удаленный реп.
Делаю:
git clone
git branch new-stuff
git checkout new-stuff
git add .
git commit -c "New stuff here"
git checkout master
git merge new-stuff
git pull
git push
Так вот при git push ругается:
malyk@vladimir-malyk:/tmp/tmpppp/master$ git push
repository@192.168.0.204's password:
Counting objects: 7, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 422 bytes, done.
Total 4 (delta 2), reused 0 (delta 0)
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 repository@192.168.0.204:/home/repository/SkyNet/master
! [remote rejected] master -> master (branch is currently checked out)
error: failed to push some refs to 'repository@192.168.0.204:/home/repository/SkyNet/master'
Мои ожидания зключались в том, что мои коммиты тут же попадут в мастер на сервере. Как бороть?
зы. В git не так давно, не могу уловить в чем дело. Интуиция подсказывает что я неправильно выбираю workflow и ожидаю что git будет похож на svn
