我在github上有一个仓库,比如testrepo。现在我想设置一个本地存储库repo
,它有一个分支origin-master
,我希望能够从存储库编辑东西。了解git:连接分支到远程存储库
repo/origin-master <--------> origin/master
克隆正常工作:
mkdir repo && cd repo && git init
# not necessary of course:
echo "master" > master && git add master && git ci -m "master"
git remote add origin [email protected]:<username>/testrepo.git
git fetch origin
git branch --set-upstream origin-master origin/master
git checkout origin-master
# create a new file:
echo "for origin-master" > orig-master && git add orig-master && git ci -m "orig-master"
但
git push origin
To [email protected]:<username>/testrepo.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:<username>/testrepo.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
我怎么能告诉混帐,如果我要推到原点,我想当地分支机构origin-master
推origin/master
?
显示不起作用的顺序,不是那个顺序。 – jthill