git push: local changes to the following files would be overwritten by merge -

i’m having issues project using git i’m working on. i'm using non-bare repository that.

after committing local changes, when run:

git status 

i get:

your branch ahead of ‘origin/master’ 1 commit.

nothing wrong that. when trying push local committed changes remote repository with:

git push origin master 

and i’m having next error message:

branch master -> fetch_head error: local changes following files overwritten merge. please, commit changes or stash them before can merge. aborting

when run

git status  

after get:

your branch up-to-date ‘origin/master’

however, when take @ remote repository, changes weren’t pulled.

many people have had same issue after pull request never, seems make bit more sense, never after push. also, have no commits make.

i know simple , obvious question ask you, but, branch trying push master ? working in master branch locally ? if in branch isn't master locally, push ignore changes of current branch.