Forge/git Error when trying to commit

Posted 4 years ago by ArchStanton

I have tried a git rm, but get the following error - the files are actually deleted.

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

Please sign in or create an account to participate in this conversation.

Reply to

Use Markdown with GitHub-flavored code blocks.