git 提交新分支到远端_git远程仓库包含未提交到本地分支的提交

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:

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.

解决方案

I read the error message once again and thought that I should merge the local branch into remote branch. I looked around in the IDE to find these options. I got lucky when I tried:

Project > right click > Git > repository browser.

The following window opens up:

Steps:

Remote branch > right click > merge revision. Then you will see the hash of remote next to local.

Project > Right click > Git > Remote > Push. This will push your local branch code to remote repo.