Git merge confusion. Diff shows differences, and merge says there are none

Question

Im starting to learn to use git, and I am having a situation that I dont understand (the repository was taken out of svn)

Im on a branch jacob@379 with ever

Answer 1

I think the problem is here:

warning: refname 'jacob@379' is ambiguous.

try HEAD instead of jacob@379

But still, probably gotta get an unambiguous branch name. I think the @ has a special meaning. Or maybe you have a tag or other ref with the same name?

Also, it's great to pop open a graphical program that shows you all the tags and branches and all that with lines. If you've got it, try: gitk --all