git commit -m not working

Question

I have been committing to my local repository today with git commit -a and entering my commit messages. Everything fine.

At the end of the day I wanted to commit a small change with a single line commit, so I used git commit -m "some message" and got the following:

On branch ChartFeature
Your branch is ahead of 'origin/ChartFeature' by 2 commits.
  (use "git push" to publish your local commits)
Changes not staged for commit:
        modified:   SomeFolder/Scripts/app/SomeScript.js

no changes added to commit

What have I done wrong?

How do I get git to allow commit -m again?

Footnote: After failing with -m a few times and seeing nothing wrong with git log origin/ChartFeature..HEAD I tried git commit -a as before and it worked (as expected) though git commit -m still does not.

Answer 1

Probably you need to merge 'origin/ChartFeature' before you push any changes.

Follow this steps

First, add all changes by using

git add -A

Then commit your changes

git commit -m "message"

Before doing push on the branch just pull once this will merge your code with the remote branch. If you want to review this code before merge then you can use git fetch

git pull origin the branch

then push the changes on the respective branch

git push origin the branch