Git: Untracked files problem


I edited my working copy of a project in git and now I can't do a git pull to merge, because I added a few files. I don't have commit privileges on the remote project, so I emailed them to the maintainer, and now git won't merge them in. I get this error:

error: The following untracked working tree files would be overwritten by merge:

There are two ways to handle this: