Ignoring ridiculous ref

Question

git version 1.7.7 

I have a Dropbox git repository.

From my work, the karl-sun computer I push my branches to my Dropbox.

When I get home on my karl-net home computer, I get the latest changes, do some more work, and then click on my Dropbox.

When I do this, I get the following messages.

 error: * Ignoring funny ref 'refs/remotes/origin/dev (karl-sun conflicted copy 2011-09-07)' locally 

It annoys if there is a way to get rid of it. And why is this happening?

Answer 1

Quote this blog post

It seems to happen when 2 people click on the source / master almost at the same time. This makes Dropbox update the same file and seems to be the cause of the error. When this happens, you can bet that one of the people who made the push will lose their change in origin / master. So you have to fix it accordingly.

The ridiculous ref bug has no critical effect on the repo and Git seems to work just fine. It will just annoy you every time you try to pick it up. It turns out that this "master" (Shiki conflict 2010-01-14) "is a branch of the main repo. Simply delete the error. In the terminal, go to the main repository (Dropbox) root folder:

git branch -d "master (Shiki conflicted copy 2010-01-14)"