blocks|key|2733757|text|我再次阅读了错误消息，并认为我应该将本地分支合并到远程分支。我在IDE中四处寻找，以找到这些选项。当我尝试的时候我很幸运：Project+>+right+click+>+Git+>+repository+browser。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|2733758|将打开以下窗口：|BOLD|2733759|​|2733760|📷|atomic|2733761|2733762|步骤：|2733763|2733764|Remote分支>右键单击>合并修订。然后，您将在本地旁边看到远程的哈希。|ordered-list-item|2733765|项目>右键单击>+Git+>远程>推送。这会将您的本地分支机构代码推送到远程存储库。|2733766|2733767|entityMap|0|IMAGE|mutability|IMMUTABLE|imageUrl|https://ask.qcloudimg.com/http-save/yehe-900000/955427674358049f3cd362ebe8593b89.jpeg|imageAlt^0|1P|1C|0|0|8|0|0|0|1|0|0|0|0|3|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|16|8|@$9|17|A|18|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|19|8|@$9|1A|A|1B|B|H]]|D|@]|E|$]]|$1|I|3|J|5|6|7|1C|8|@]|D|@]|E|$]]|$1|K|3|L|5|M|7|1D|8|@]|D|@$9|1E|A|1F|1|1G]]|E|$]]|$1|N|3|J|5|6|7|1H|8|@]|D|@]|E|$]]|$1|O|3|P|5|6|7|1I|8|@$9|1J|A|1K|B|H]]|D|@]|E|$]]|$1|Q|3|-4|5|6|7|1L|8|@]|D|@]|E|$]]|$1|R|3|S|5|T|7|1M|8|@]|D|@]|E|$]]|$1|U|3|V|5|T|7|1N|8|@]|D|@]|E|$]]|$1|W|3|-4|5|6|7|1O|8|@]|D|@]|E|$]]|$1|X|3|-4|5|6|7|1P|8|@]|D|@]|E|$]]]|Y|$Z|$5|10|11|12|E|$13|14|15|-4]]]]

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:
<code>Project &gt; right click &gt; Git &gt; repository browser</code>. 

The following window opens up:

<img src="https://i.stack.imgur.com/XuF89.jpg" alt="enter image description here">

Steps: 

<ol>
<li>Remote branch > right click > merge revision. Then you will see the hash of remote next to local.</li>
<li>Project > Right click > Git > Remote > Push. This will push your local branch code to remote repo.</li>
</ol>

blocks|key|2946512|text|实现一种拉动。然后会出现一个带有“合并”选项的窗口。执行合并并尝试再次推送它。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2946513|对不起，我的英语水平|2946514|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

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

blocks|key|152182|text|type|unstyled|depth|inlineStyleRanges|entityRanges|data|152183|不要使用git+pull，使用git+fetch，然后使用git+merge，然后使用git+commit，然后使用git+push。|blockquote|152184|152185|152186|仅供参考：http://longair.net/blog/2009/04/16/git-fetch-and-merge/|offset|length|152187|entityMap|0|LINK|mutability|MUTABLE|url|http://longair.net/blog/2009/04/16/git-fetch-and-merge/^0|0|0|0|0|5|1J|0|0^^$0|@$1|2|3|-4|4|5|6|R|7|@]|8|@]|9|$]]|$1|A|3|B|4|C|6|S|7|@]|8|@]|9|$]]|$1|D|3|-4|4|5|6|T|7|@]|8|@]|9|$]]|$1|E|3|-4|4|5|6|U|7|@]|8|@]|9|$]]|$1|F|3|G|4|5|6|V|7|@]|8|@$H|W|I|X|1|Y]]|9|$]]|$1|J|3|-4|4|5|6|Z|7|@]|8|@]|9|$]]]|K|$L|$4|M|N|O|9|$P|Q]]]]

<blockquote>
 Don’t use git pull, use git fetch, then git merge, then git commit and then git push.
</blockquote>

FYI: <a href="http://longair.net/blog/2009/04/16/git-fetch-and-merge/" rel="noreferrer">http://longair.net/blog/2009/04/16/git-fetch-and-merge/</a>

blocks|key|2733948|text|右键单击您的项目>+Git+>+Remote+>+fetch右键单击您的项目>+Git+>+Branch/+tag+>+Merge+Revision单击merge+Now+u应该能够执行推送...|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2733949|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

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...

blocks|key|2733973|text|如果你在git仓库浏览器中看不到remote下的文件，那么首先你需要拉取才能解决上面的问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2733974|步骤：|offset|length|style|BOLD|2733975|1.右键单击project+>+Git+>+Remote+>+Pull+>然后选择merge选项。|2733976|2.右键单击project+>+Git+>+Remote+>+Push。|2733977|问题现在应该已经解决了:-)|2733978|entityMap^0|0|0|3|0|0|0|0^^$0|@$1|2|3|4|5|6|7|P|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Q|8|@$D|R|E|S|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|T|8|@]|9|@]|A|$]]|$1|J|3|K|5|6|7|U|8|@]|9|@]|A|$]]|$1|L|3|M|5|6|7|V|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|W|8|@]|9|@]|A|$]]]|O|$]]

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 :-)

blocks|key|2733985|text|我会删除存储库。重新创建存储库。请不要做任何事。然后在NetBeans内部添加和提交后推送它。请记住，您可以创建README.md，任何以后的事情。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2733986|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

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.

blocks|key|2734083|text|虽然它已经解决了。我只想把它贴在这里。我遇到了和你一样的错误，但它的发生是因为我在github中修改了我的存储库，而没有将它拉到我的本地存储库。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2734084|您需要remote+>+pull，然后选择rebase。|offset|length|style|CODE|2734085|我就是这么做的|2734086|entityMap^0|0|3|D|L|6|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|M|8|@$D|N|E|O|F|G]|$D|P|E|Q|F|G]]|9|@]|A|$]]|$1|H|3|I|5|6|7|R|8|@]|9|@]|A|$]]|$1|J|3|-4|5|6|7|S|8|@]|9|@]|A|$]]]|K|$]]

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 <code>remote &gt; pull</code> and then choose <code>rebase</code>.
that's what i did

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 <code>amend last commit</code> checkbox and committed it to my local repository. When I push this commit to my github repo, I get the error: <code>git remote repository contains commits unmerged into the local branch. open output to see more information.</code> 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:

<img src="https://i.stack.imgur.com/yO2Iu.jpg" alt="enter image description here">

Output message:

<pre><code>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.
</code></pre>

git remote repository contains commits unmerged into the local branch

我在netbeans IDE中使用git。我想要更改我最近提交的提交消息。我这样做了，选中了amend last commit复选框，并将其提交到我的本地存储库。当我将这个提交推送到我的github代码库时，我得到了错误：git remote repository contains commits unmerged i...

问git远程存储库包含未合并到本地分支的提交
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git远程存储库包含未合并到本地分支的提交EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git远程存储库包含未合并到本地分支的提交
EN