При попытке записать свои изменения на git-сервер получаю ошибку:
CODE (htmlphp):
скопировать код в буфер обмена
скопировать код в буфер обмена
- $ git pull origin dev4
- Password for 'https://mylogin@bitbucket.org':
- remote: Counting objects: 21, done.
- remote: Compressing objects: 100% (21/21), done.
- remote: Total 21 (delta 12), reused 0 (delta 0)
- Unpacking objects: 100% (21/21), done.
- From https://bitbucket.org/projectname/[[https://bitbucket.org/projectname/zntral|projectname]]
- * branch dev4 -> FETCH_HEAD
- 56fba94..77dbc70 dev4 -> origin/dev4
- Updating 56fba94..77dbc70
- error: Your local changes to the following files would be overwritten by merge:
- application/config/config.php
- index.php
- Please, commit your changes or stash them before you can merge.
- Aborting