0

I have a branch on GitHub (origin) called issue75. I have a local issue75 branch that I'm trying to sync up with origin, but when I run the following...

git merge origin/issue75

I end up with a message telling me "Already up-to-date."

However, if I compare them with...

git diff origin/issue75

I do see that there are differences between the files in my local issue75 branch vs. the origin/issue75 branch.

I'm not sure how to resolve this at this point and would appreciate any assistance I can get. Thanks!

Drew Angell
  • 25,968
  • 5
  • 32
  • 51
  • Check this: http://stackoverflow.com/questions/634546/git-merge-reports-already-up-to-date-though-there-is-a-difference. I think the differences are only the extra on local branch. – buff Jul 02 '14 at 08:48
  • 1
    Duplicate of [Git merge reports “Already up-to-date” though there is a difference](http://stackoverflow.com/q/634546/456814). –  Jul 02 '14 at 09:01
  • If you do a simple `git log --graph --oneline --decorate issue75 origin/issue75`, you'll be able to tell the relationship between your branches. –  Jul 02 '14 at 09:01

0 Answers0