I did a git pull
from my upstream on a clean working directory and it presents me with merge conflicts. I spent about an hour manually resetting them thinking I had screwed something up and it happened again.
Is this a bug in git? I know little about it, so I'm fully willing to accept that I did this to myself.
Here's my truncated output (it happens to about 9 files but I wanted to save space, and file names have been changed to protect the innocent):
$ git status
# On branch master
nothing to commit (working directory clean)
$ git pull
Auto-merged xxxx/xxxx/xxxx.xxx
CONFLICT (content): Merge conflict in xxxx/xxxx/xxxx.xxx
Automatic merge failed; fix conflicts and then commit the result.
I'm using Solaris 11 Express with the package default git.
$ uname -a
SunOS xxxx 5.11 snv_151a i86pc i386 i86pc Solaris
$ git --version
git version 1.5.6.5
$ pkg list git
NAME (PUBLISHER) VERSION STATE UFOXI
developer/versioning/git 1.5.6.5-0.151.0.1 installed -----
I found this question: Git pull fails: You have unstaged changes. Git status: nothing to commit (working directory clean), which seems closest but has an unsatisfying answer.
How can I get past this without deleting my entire repository and making a new clone?