git pullでnot uptodateエラー

./script/serverのログをgitに突っ込んでたら、別マシンでgit pusll origin masterした際にログがuptodateじゃなよと言われてpullできなかった。
単純にログをrmしたら通ったけど、いまいち腑に落ちない。
git cloneからやりなおしてもいいけど、面倒くさい。強制的に上書きする方法はないのだろうか？

% git pull origin master
remote: Counting objects: 30, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 17 (delta 12), reused 0 (delta 0)
Unpacking objects: 100% (17/17), done.
From git@github.com:mumoshu/kokodoko
* branch master -> FETCH_HEAD
Updating 6ea3f4d..b5b2798
log/development.log: needs update
error: Entry 'log/development.log' not uptodate. Cannot merge.
gotti% rm log/development.log
gotti% git pull origin master
From git@github.com:mumoshu/kokodoko
* branch master -> FETCH_HEAD
Updating 6ea3f4d..b5b2798
log/development.log: needs update
Fast forward
app/views/_layout.html.erb | 36 +-
app/views/marks/index.html.erb | 13 +-
app/views/quizzes/_quiz_form.html.erb | 35 +
app/views/quizzes/_quiz_form.html.erb~ | 31 +
app/views/quizzes/edit.html.erb | 52 +-
app/views/quizzes/index.html.erb | 8 +-
app/views/quizzes/index.html.erb~ | 25 +-
app/views/quizzes/new.html.erb | 33 +-
app/views/quizzes/new.html.erb~ | 27 +-
db/development.sqlite3 | Bin 19456 -> 19456 bytes
log/development.log |18410 ++++++++++++++++++++++++++++++++
11 files changed, 18573 insertions(+), 97 deletions(-)
create mode 100644 app/views/quizzes/_quiz_form.html.erb
create mode 100644 app/views/quizzes/_quiz_form.html.erb~