How to force a pull to succeed?

I scp'd a file to another machine for testing. The change tested OK, so I checked it in on the original machine.

I'm now on the remote machine, and I'm trying to pull the same exact file that exists on both local and remote. Git won't allow me to do it, even with -f.

I'd really like -f (or another switch) to work as expected. I don't like issuing extra command or extra typing.

How do I force the pull to succeed?

Thanks in adavnce.

**************

qotom:cryptopp$ git pull
Updating 30ac06d..30ac53f
error: Your local changes to the following files would be overwritten by merge:
        datatest.cpp
Please commit your changes or stash them before you merge.
Aborting
qotom:cryptopp$ git pull -f
Updating 30ac06d..30ac53f
error: Your local changes to the following files would be overwritten by merge:
        datatest.cpp
Please commit your changes or stash them before you merge.