Hi,
I think git pull does not refresh the index before trying to merge:
Tirana:gitbot pieter$ git reset --hard 5ff4dff
HEAD is now at 5ff4dff Add a Git FAQ plugin
Tirana:gitbot pieter$ touch test/gitfaq.rb
Tirana:gitbot pieter$ git pull
Updating 5ff4dff..931a247
error: Entry 'test/gitfaq.rb' not uptodate. Cannot merge.
Tirana:gitbot pieter$ git st
# On branch master
# Your branch is behind 'origin/master' by 2 commits, and can be fast-
forwarded.
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# GitLink.py
# faq.yaml
# test.py
nothing added to commit but untracked files present (use "git add" to
track)
Tirana:gitbot pieter$ git pull
Updating 5ff4dff..931a247
Fast forward
plugins/gitfaq.rb | 46 ++++++++++++++++++++++--------------------
plugins/irc.rb | 56 +++++++++++++++++++++++++
+-------------------------
test/faq-test.html | 10 +++++++++
test/gitfaq.rb | 42 +++++++++++++++++++-------------------
4 files changed, 84 insertions(+), 70 deletions(-)
create mode 100644 test/faq-test.html