Git错误文件不再存在

时间:2015-05-06 11:56:55

标签: git git-merge

我尝试过git rm,但收到以下错误 - 文件实际上已删除。

error: Your local changes to the following files would be overwritten by merge:
    vendor/aws/aws-sdk-php/src/Aws/CognitoSync/CognitoSyncClient.php
    vendor/aws/aws-sdk-php/src/Aws/CognitoSync/Resources/cognitosync-2014-06-30.php

0 个答案:

没有答案