我是新手,尝试通过以下方法将我标记的本地开发分支合并到远程主服务器(注意:为清楚起见,这些是虚拟名称):
> git checkout master
> git merge --no-ff development
> git push origin master
> git tag -a v2.0 -m "New production code."
但是
> git checkout master
error: pathspec 'master' did not match any file(s) known to git.
我已经完成git fetch --all
,但没有返回控制台。
尝试
> git branch -a
* development
的完整输出
我的master
去哪了?我一直在进行更改,并且可以在我的远程GitLab存储库中看到它。
使用git版本2.14.2.windows.3
编辑:git reflog
的输出带有我仓库中的真实姓名
$ git reflog
f200462 (HEAD -> naei17dev) HEAD@{0}: commit: Updated
703ef7e HEAD@{1}: commit: Update
144ecdb HEAD@{2}: commit: Initial commit
0992345 HEAD@{3}: commit: Not needed
580e25e HEAD@{4}: commit: Added as variables for checking
594f3ed HEAD@{5}: commit: Fiel system path change
15282a5 HEAD@{6}: commit: Added parameter file
af1846f HEAD@{7}: commit: Re-instated
f99d440 HEAD@{8}: commit: Added parameters file
0ee8227 HEAD@{9}: commit: Update tailoring for changed downloaded data format.
a558bd6 HEAD@{10}: commit: Revision for this year's data.
e55c2b7 HEAD@{11}: commit: Update tailoring to changed downloaded data format.Re vised record check.
b25490b HEAD@{12}: commit: Change England-Wales record check
b6a2f95 HEAD@{13}: commit: Add unzip function. Tailor code to changed downloaded data format.
ca129a3 HEAD@{14}: commit: Update sources
80e0a8c HEAD@{15}: commit: New NAEI year run
6cb8107 HEAD@{16}: commit: Removed
0348715 (tag: naei2016) HEAD@{17}: checkout: moving from 03487159e1f1b61efcb0587 cfc2c59f125e2451a to naei17dev
0348715 (tag: naei2016) HEAD@{18}: clone: from git@git.<CONFIDENTIAL>/ population-distribution.git
答案 0 :(得分:0)
更新:从远程git clone
和git merge
删除本地仓库,git push
正常。 Git必须沿线某个位置“断开”。