SourceTree拉错误

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。修改了本地文件

MutationObserver

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.

建议

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

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