git remote repository contains commits unmerged into the local branch
Solution 1
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.
Solution 2
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 3
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 4
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 :-)
Related videos on Youtube
james
Updated on February 10, 2022Comments
-
james about 2 years
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.
-
Rasshu about 9 yearsIn my case, I had to do another commit after step 1.
-
Hack-R about 8 yearsIn my case, I needed to go to Remotes (not Remote, Remotes) > right click > Fetch and then I could proceed to Step 1
-
Michael K over 6 yearsThis also worked for me. My problem was I created a README.md file before I did a push from Netbeans. I deleted the README, but it just saw there were commits remotely that it didn't have so didn't allow me to push until I pulled first. But yeah maybe I should do Daniel's suggestion in another answer to fetch then merge instead. I like to see whats happening.