Git SourceTree拉取错误

我将

拉入本地存储库时出错。以下是错误日志：

git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin

git -c diff.mnemonicprefix=false -c core.quotepath=false pull --no-commit origin master
From https://bitbucket.org/svalecillos/sistemanomastattut
 * branch            master     -> FETCH_HEAD

error: Your local changes to the following files would be overwritten by merge:
    app/Http/Controllers/Auth/AuthController.php
    config/app.php
    resources/views/auth/login.blade.php
    resources/views/auth/register.blade.php
Please commit your changes or stash them before you merge.



error: The following untracked working tree files would be overwritten by merge:
    resources/views/emails/password.blade.php
Please move or remove them before you merge.
Aborting



Completed with errors, see above.

您需要知道的一切都在您提供的错误日志中

1.修改的本地文件
2.git中还没有新的本地文件
建议
在这种情况下，我通常做的是隐藏本地更改，进行拉取，然后应用隐藏并合并任何冲突

对于本地新的/未跟踪的文件，对文件进行备份，在本地将其删除，然后在拉取后可以将其与拉取的文件进行比较。（提示：如果在隐藏之前暂存未跟踪的文件，它将成为隐藏文件的一部分。）

error: Your local changes to the following files would be overwritten by merge:
    (...)
Please commit your changes or stash them before you merge.

error: The following untracked working tree files would be overwritten by merge:
    (...)
Please move or remove them before you merge.