Merging in git: via git-svn, says Already Up-to-date, but git-diff says there are differences

Posted by Josiah Kiehl on Stack Overflow See other posts from Stack Overflow or by Josiah Kiehl
Published on 2010-05-11T05:19:26Z Indexed on 2010/05/11 5:24 UTC
Read the original article Hit count: 345

Filed under:
|
|
|

I'm using git-svn to work with a codebase and I need to merge changes in trunk to my branch.

I have both branches fetched in git, and when I run git diff trunk while in my branch, I can see all the changes.

When I run git merge heads/trunk, however, I get a message "Already up-to-date".

It's clearly not up to date. What am I doing wrong?

© Stack Overflow or respective owner

Related posts about git

Related posts about svn