Can someone explain how a 'git pull' can result in an auto-merge
conflict, thus be left with a manual merge to be done, 'git status'
showing 'unmerged' files as a result and still have 'git mergetool'
show 'No files to be merged' ?
That's the second time I encounter this - sometimes git-mergetool
works, sometimes it just reports nothing to be merged, and I don't
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to
For more options, visit this group at