At Twidl HQ, we use a combination of Git and Dropbox for managing our source code. It’s a simple but awesome setup. Sometimes, we get this really cryptic error when fetching from our main repo (our shared Dropbox folder):
Ignoring funny ref 'refs/remotes/origin/master (Shiki's conflicted copy 2010-01-14)' locally
It seems to happen when 2 people push to origin/master at almost 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 did the push will lose his changes to origin/master.
So you’ll have to fix it accordingly.
The “funny ref” error does not have any critical effect on the repo and Git seems to work perfectly. It will just annoy you every time
you try to fetch. It turns out that this "master (Shiki's conflicted copy 2010-01-14)" is a branch in the main repo.
Simply deleting it will remove the error. In terminal, go to your main repo’s (Dropbox) root folder:
$ git branch -d "master (Shiki's conflicted copy 2010-01-14)"
If you’re not sure of the name of the conflicting branch, you can execute git branch to show all branches.
There should at least be a “master” branch and your conflicting branch.