このコマンドで何かをコミットしようとしました:
git commit file_name
push origin reponame develop
そして、エラーが発生しました:
error: failed to push some refs to 'https://my_repo_path'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
だから私はやろうとした
git pull origin repo_name
そして、それは私に次のエラーを与えました:
* branch develop -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
... 3 file_names
Please, commit your changes or stash them before you can merge.
これを解決する一般的な方法は何ですか?
ありがとう!