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 [...]