Comments for Shiki

Comment on “Ignoring funny ref” error on Git + Dropbox by Filipe Correia

Filipe Correia — Mon, 19 Jul 2010 12:19:25 +0000

Ok, got it. Turns out I was trying to delete the branch locally (although it obviously only existed on the server). Thanks!

Comment on “Ignoring funny ref” error on Git + Dropbox by Shiki

Shiki — Sat, 17 Jul 2010 02:36:29 +0000

Yes that’s right. You should use the repo on Dropbox. I’ve deleted conflicted branches like that with no problem. All I had to do was fetch-merge-push again to put my local changes to the Dropbox repo. Use

branch -D

to delete it if you can’t delete it with “branch -d” (small d).

Also, notice that your Git repo actually still works with that conflicted copy in there. It just annoys you with the warning message when you fetch.

Comment on “Ignoring funny ref” error on Git + Dropbox by Filipe Correia

Filipe Correia — Fri, 16 Jul 2010 10:10:56 +0000

Ok, I think i’m on to something. I’ve just checked my repo files (on dropbox) and found these two files on the path “/refs/heads”:

master
master (fcorreia's conflicted copy 2010-07-14)

It seems that this “master” file as conflicted, so dropbox automatically copied it to another filename. I wonder if I can just delete this file from the repo without leaving other garbage behind, and without losing commits.

Comment on “Ignoring funny ref” error on Git + Dropbox by Filipe Correia

Filipe Correia — Fri, 16 Jul 2010 09:49:55 +0000

I’m not being able to delete it. In fact, it’s not showing up when I list the branches (only “master” shows up). It seems there isn’t actually a branch named “master (fcorreia’s conflicted copy 2010-07-14)”.

Comment on “Ignoring funny ref” error on Git + Dropbox by Shiki

Shiki — Fri, 16 Jul 2010 07:55:59 +0000

From my experience, you could no longer merge with that branch. It seems to be a corrupted branch file because it was overwritten by somebody else who pushed to the dropbox repo.

Deleting the branch didn’t work for you? Are you deleting it from the dropbox repo? When I get errors like this, I just delete that conflicted branch and fetch-merge-push again. I never lost any of my commits due to the conflict. They just didn’t get pushed properly because of dropbox’ syncing conflicts.

Comment on “Ignoring funny ref” error on Git + Dropbox by Filipe Correia

Filipe Correia — Thu, 15 Jul 2010 22:16:13 +0000

Hi! Thanks for writting this post. It was the only reference I’ve found to this issue…
I’m finding the same problem myself (using dropbox too), but I’m not being able to solve it the same way you did.

Here’s what I’m seeing:

$ git pull
error: * Ignoring funny ref 'refs/remotes/origin/master (fcorreia's conflicted copy 2010-07-14)' locally
Already up-to-date.
$ git branch "merge" "master (fcorreia's conflicted copy 2010-07-14)"
fatal: Not a valid object name: 'master (fcorreia's conflicted copy 2010-07-14)'.
$ git branch
* master

Any thoughts that might help?

Thanks!

Comment on Installing Memcached for PHP 5.3 on Windows 7 by Ronen

Ronen — Sun, 04 Jul 2010 17:37:41 +0000

Great helpful work Shiki! worked great for me.
Thanks.

Comment on Installing Memcached for PHP 5.3 on Windows 7 by Dominic Watson

Dominic Watson — Wed, 12 May 2010 10:00:34 +0000

how are we supposed to let you know? you didn’t provide contact details ^^

Thanks for this article

Comment on Installing Memcached for PHP 5.3 on Windows 7 by paul

paul — Fri, 30 Apr 2010 07:55:59 +0000

Tnx man, you saved my life

Comment on FirePHP Logger for Yii Framework by Tweets that mention FirePHP Logger for Yii Framework « Shiki -- Topsy.com

Tweets that mention FirePHP Logger for Yii Framework « Shiki -- Topsy.com — Sat, 10 Apr 2010 11:28:33 +0000

[...] This post was mentioned on Twitter by Shiki. Shiki said: #FirePHP Logger for #Yii Framework http://bit.ly/awTVFg [...]