'git remote repository contains commits unmerged into the local branch

I am using git inside netbeans IDE. I wanted to change the commit message for the most recent commit I had made. I did that, checked the amend last commit checkbox and committed it to my local repository. When I push this commit to my github repo, I get the error: git remote repository contains commits unmerged into the local branch. open output to see more information. How do I fix this ? I am new to source control. I only want to do very basic version control with my current project. Please tell me how to fix this.

Screen:

enter image description here

Output message:

git branch
git remote -v
setting up remote: origin
git submodule status
git push https://github.com/double-whammy/netbeans_affablebean.git refs/heads/master:refs/heads/master
Remote Repository Updates
Branch Update : master
Old Id        : id1
New Id        : id2
Result        : REJECTED_NONFASTFORWARD
Local Repository Updates
Branch Update : origin/master
Old Id        : id1
New Id        : id2
Result        : NOT_ATTEMPTED
==[IDE]== Pushing - AffableBean finished.


Solution 1:[1]

Realize a pull. Then a window with the option 'merge' will appear. Do a merge and try to push it again.

Sorry for my english level

Solution 2:[2]

Don’t use git pull, use git fetch, then git merge, then git commit and then git push.

FYI: http://longair.net/blog/2009/04/16/git-fetch-and-merge/

Solution 3:[3]

If you can not see the file under remote in the git repository browser then first you need to pull in order to solve the above problem.
Steps:
1.Right click project > Git > Remote > Pull > then select merge option.
2.Right click project > Git > Remote > Push.
The problem should be solved by now :-)

Solution 4:[4]

Right click your project > Git > Remote > fetch Right click your project > Git > Branch/ tag > Merge Revision Click merge Now u should be able to do the push...

Solution 5:[5]

I would delete the repository. Recreate the repository. Please don't commit anything. Then push it after adding and committing inside NetBeans. Remember, you can create README.md, anything later.

Solution 6:[6]

Though it's already solved. just want to post it down here. I had the same error as yours but it happened because i modified my repository in github and didn't pull it to my local repository.

you need to remote > pull and then choose rebase.

that's what i did

Sources

This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.

Source: Stack Overflow

Solution Source
Solution 1 v-system
Solution 2 Daniel De León
Solution 3
Solution 4 Viv Mendes
Solution 5 chikitin
Solution 6 Kai - Kazuya Ito