git branches show diffs but merge does nothing
===

I have two branches, "svnbranch" that's updated via "git svn rebase" and "master" used by other git users that push their changes.

Right now when I do "git diff master" I see some changes in master that I want to merge into svnbranch so I can "dcommit" them. However, when I do "git merge master" nothing happens:

git checkout svnbranch

git diff master

   ... some changes are shown

git merge master

Already up-to-date

Why don't the changes get merged in?



[Note: What I'm really trying to do is generate a git repo that's a mirror of our SVN repo and manually merge changes both ways. I tried automating that but can't get that running smoothly so I manually merge every few days]