源树拉取错误

Question

当我对本地存储库进行pull时出现错误。以下是错误日志：

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.

Answer 1

您需要

知道的所有内容都在您提供的错误日志中。

1. 修改本地文件

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

2. 新的本地文件尚未在 git 中

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

建议

1. 在这种情况下，我通常做的是隐藏我的本地更改，执行拉取，然后应用存储并合并任何冲突。

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