1

No matter what repository I am in I get this response from git pull "merge: 012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012 - not something we can merge". I have tried uninstalling git and re-installing with no luck. git fetch origin and git merge origin/master work fine. I could very well use those commands instead of git pull but Homebrew uses git pull and now it is broken too.

[UPDATE] This apparently was related to pyenv. Once I removed that from my PATH then everything went back to normal.

cwardzala
  • 21
  • 4
  • possible duplicate of [How does "not something we can merge" arise?](http://stackoverflow.com/questions/14388625/how-does-not-something-we-can-merge-arise) – Jose Magana Aug 12 '14 at 18:02
  • Please do `git remote -v` and what is this merge: thing you're adding at the end of git pull ? – Michael Durrant Aug 12 '14 at 18:07
  • What's in `.git/FETCH_HEAD` at this point? The `pull` script writes stuff in that file, in a historic (but kind of botched) attempt to make `git fetch` and `git merge` work without needing "remote tracking branches". – torek Aug 12 '14 at 18:45
  • @MichaelDurrant The "merge" is not part of `git pull` that is the message I get when I do a pull. – cwardzala Aug 13 '14 at 13:04
  • @JoseMagana I would say no. This happens to all repositories, the message is different, and the SHA is not really a SHA. – cwardzala Aug 13 '14 at 13:14
  • Someone just ran into this again: http://stackoverflow.com/questions/27592779/git-pull-always-fails-but-git-fetch-merge-are-fine – Kaz Dec 21 '14 at 20:01

0 Answers0