我从本地目录添加了一些更改到暂存区域，然后提交并尝试推送子集。我收到一条消息，要求我必须先拉取，我就这么做了，希望有人问我是否有任何冲突。相反，我丢失了本地目录中的所有更改，包括刚刚添加的更改和我尝试提交的更改。
以下是错误消息。首先，这个：
git pull origin master
remote: Enumerating objects: 11, done.
remote: Counting objects: 100% (11/11), done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 9 (delta 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (9/9), 6.55 KiB | 0 bytes/s, done.
From https://github.com/xxxxxxx/xxxxx
* branch master -> FETCH_HEAD
b713141..adcf8c4 master -> origin/master
error: Your local changes to the following files would be overwritten by merge: LIST OF FILES
然后是这个。
error: Your local changes to the following files would be overwritten by merge:
.Rproj.user/1B350229/pcs/debug-breakpoints.pper
.Rproj.user/1B350229/pcs/files-pane.pper
.Rproj.user/1B350229/pcs/source-pane.pper
.Rproj.user/1B350229/pcs/windowlayoutstate.pper
.Rproj.user/1B350229/pcs/workbench-pane.pper
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
github-git-cheat-sheet.pdf
Please move or remove them before you merge.
Aborting
Index was not unstashed.
Merge with strategy ort failed.
我尝试使用以下建议进行恢复，但没有成功：
Git checkout -- 恢复丢失的文件我的本地文件是否丢失或者我可以恢复我提交（但未推送）的文件吗？我添加但未提交的文件怎么办？