I'm pulling from a repository that only I have access to.  As far as I know, I've only pushed to it from one repository.  A couple of times, I've pulled from it and gotten this:
To 
[email protected]:tsched_dev.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '
[email protected]:tsched_dev.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.
Generally, that just means that I have to do a git pull (although all the changes should be fast-forwardable).  When I do a git pull, I get conflicts.  If I do a git pull --rebase, it works fine.  What am I doing wrong?