Question

I just tried to commit something with this command:

git commit file_name
push origin reponame develop

and I got and error:

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.

so then I tried to do

git pull origin repo_name

and it gave me an error that:

* 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.

What is the common way to resolve this?

Thanks!

Answer 1

It sounds like you have files that you modified but didn’t commit. Try stashing your changes first, and then re-apply them on top of the head:

git stash
git pull origin repo_name
git stash pop