blocks|key|245757|text|首先尝试git+checkout+master，以进入健康的、命名良好的分支。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|245758|entityMap^0|4|J|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|K|8|@]|D|@]|E|$]]]|G|$]]

Try a <code>git checkout master</code> first to get on the healthy, well-named branch.

blocks|key|462363|text|冲突的文件可能在多个位置，我将查看：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|462364|.git/logs/refs/remotes/origin/
.git/logs/refs/heads/
.git/refs/remotes/origin/
.git/refs/heads/|code-block|syntax|javascript|462365|或者，您可以查看.git子目录中的所有内容：find+.+-name+'*conflicted*'|offset|length|style|CODE|462366|否则，使用git+branch+-a列出活动分支并删除(git+branch+-d)任何可疑的分支。|462367|entityMap^0|0|0|8|4|M|R|0|5|D|S|D|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|R|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|S|8|@$I|T|J|U|K|L]|$I|V|J|W|K|L]]|9|@]|A|$]]|$1|M|3|N|5|6|7|X|8|@$I|Y|J|Z|K|L]|$I|10|J|11|K|L]]|9|@]|A|$]]|$1|O|3|-4|5|6|7|12|8|@]|9|@]|A|$]]]|P|$]]

The conflicted file could be in multiple places, I would look into:

<pre><code>.git/logs/refs/remotes/origin/
.git/logs/refs/heads/
.git/refs/remotes/origin/
.git/refs/heads/
</code></pre>

Or you might look everywhere in the <code>.git</code> subdirectory: <code>find . -name '*conflicted*'</code>

Or, otherwise, list the active branches with <code>git branch -a</code> and delete (<code>git branch -d</code>) anything suspicious.

blocks|key|462428|text|我能够从我的.git文件夹中删除所有冲突的文件，但我仍然收到关于不再存在的文件的错误信息。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|462429|对我来说，修复方法是打开.git/refs/packed_refs并删除包含"conflicted“文本的行。|offset|length|style|CODE|462430|entityMap^0|0|C|L|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@$D|L|E|M|F|G]]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

I was able to delete all the conflicted files from my .git folder, but I continued to get errors about files that no longer existed.

The fix for me was opening up <code>.git/refs/packed_refs</code> and deleting lines that contained the text "conflicted".

blocks|key|245893|text|如果您对此不确定，请备份您的存储库，因为这些命令是不可逆的。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|245894|首先，转到您的repo目录。|245895|cd+myrepo|code-block|syntax|javascript|245896|然后递归地搜索冲突的文件并将其删除|245897|find+.+-type+f+-name+"*+conflicted+copy*"+-exec+rm+-f+{}+\;|245898|最后，从git的packed-refs文件中删除任何“冲突”的引用|245899|awk+'!/conflicted/'+.git/packed-refs+>+temp+&&+mv+temp+.git/packed-refs|245900|entityMap^0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|S|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|T|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|U|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|V|8|@]|9|@]|A|$]]|$1|K|3|L|5|F|7|W|8|@]|9|@]|A|$G|H]]|$1|M|3|N|5|6|7|X|8|@]|9|@]|A|$]]|$1|O|3|P|5|F|7|Y|8|@]|9|@]|A|$G|H]]|$1|Q|3|-4|5|6|7|Z|8|@]|9|@]|A|$]]]|R|$]]

make a backup of your repo if you aren't sure about this one, because these commands are irreversible. 

first, go to your repo directory.

<pre><code>cd myrepo
</code></pre>

then recursively search for the conflicted files and delete them

<pre><code>find . -type f -name "* conflicted copy*" -exec rm -f {} \;
</code></pre>

lastly, remove any "conflicted" references from git's packed-refs file

<pre><code>awk '!/conflicted/' .git/packed-refs &gt; temp &amp;&amp; mv temp .git/packed-refs
</code></pre>

blocks|key|245922|text|当我的同事在Dropbox更新之前推送他的更改并关闭PC时，我们的团队也会发生这种情况。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|245923|我把它解决得很简单。|245924|刚删除了冲突的副本。(XXXX冲突副本yyyy-mm-dd)|245925|然后正常地拉它。|245926|请注意，我的同事在搞砸之前就做了这些更改。他又一次推动了他的改变。这一次没有关机。:)|245927|entityMap^0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|N|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|O|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|P|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|Q|8|@]|9|@]|A|$]]]|K|$]]

This also happen to our team when my colleague push his changes and shutdown the PC before Dropbox get updated.

I solved it so simply.

Just deleted the conflicted copy. (XXXX's conflicted copy yyyy-mm-dd)

And pull it normally.

Note that my colleague had the changes before messed up. And he push his changes again. This time no shutdown. :)

blocks|key|462573|text|我遇到了类似的错误，比如|type|unstyled|depth|inlineStyleRanges|entityRanges|data|462574|fatal:+Reference+has+invalid+format:+'refs/heads/user-search-api+(Sithu's+conflicted+copy+2016-01-08)'|code-block|syntax|javascript|462575|简单地删除远程Dropbox存储库中的.git/refs/heads/user-search-api+(Sithu's+conflicted+copy+2016-01-08)文件就可以解决这个问题。|offset|length|style|CODE|462576|entityMap^0|0|0|J|1W|0^^$0|@$1|2|3|4|5|6|7|O|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|P|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|Q|8|@$I|R|J|S|K|L]]|9|@]|A|$]]|$1|M|3|-4|5|6|7|T|8|@]|9|@]|A|$]]]|N|$]]

I encounterd the similar error such as

<pre><code>fatal: Reference has invalid format: 'refs/heads/user-search-api (Sithu's conflicted copy 2016-01-08)'
</code></pre>

Simply deletion of the file <code>.git/refs/heads/user-search-api (Sithu's conflicted copy 2016-01-08)</code> in the remote Dropbox repository did solve the problem.

I am using <code>Dropbox</code> to sync a <code>git</code> repository, but now when I try and <code>push</code> I am getting an error:

<pre><code>fatal: Reference has invalid format: 'refs/heads/master (MacBook-Pro's conflicted copy 2012-10-07)'
</code></pre>

So, it seems that Dropbox detected a conflict and created a copy. Ok, no problem, so I deleted the conflicted file. Still, getting the above git error though.

<pre><code>$ git checkout master
 M index.html
 Already on 'master'
$ git add .
$ git commit -a -m "Cleanup repo"
 [master ff6f817] Cleanup repo
 1 file changed, 5 insertions(+), 5 deletions(-)
$ git push
 fatal: Reference has invalid format: 'refs/heads/master (MacBook-Pro's conflicted copy 2012-10-07)'
 The remote end hung up unexpectedly`
</code></pre>

How can I fix this? Thanks.

Git fatal: Reference has invalid format: 'refs/heads/master

我正在使用Dropbox同步git存储库，但现在当我尝试使用push时，我得到了一个错误：fatal: Reference has invalid format: 'refs/heads/master (MacBook-Pro's conflicted copy 2012-10-07)'因此，Dropbox似乎检测到了...

问Git fatal:引用的格式无效：‘refs/head/master
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git fatal:引用的格式无效：‘refs/head/masterEN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git fatal:引用的格式无效：‘refs/head/master
EN