Java tips: How to solve the problem of "Remote repository contains commits unmerged into the local branch" in NetBeans?

I followed the below instructions to push a Java project in Netbeans 8.0.1 into a Bitbucket repository, but following error popped up:
enter image description here

Project > Team > Git > Initialize
Project > Right Click > Team > Commit
Project > Team > Remote > Push > ...
I tried to solve this issue following the procedure in this post, but no success.

The best answer:
The message is saying that your local repository is not up to date with the remote repository. You need to pull from the remote repo and merge or discard changes if necessary. Once that is done you should be able to push your commits.

I tried this method. It works!
Good luck!

References:
http://stackoverflow.com/questions/26803858/netbeans-8-0-1-remote-repository-contains-commits-unmerged-into-the-local-bran


Comments

Post a Comment

Popular posts from this blog

gspread error:gspread.exceptions.SpreadsheetNotFound

Error message: Traceback (most recent call last):   File "read_google_sheet.py", line 20, in <module>     wks = gc.open_by_key("1jUJOlICOH6VnyuALdU2VAc_Ci_ZVwdW-xc5kr_qkJHY")   File "/usr/lib/python2.7/site-packages/gspread/client.py", line 113, in open_by_key     raise SpreadsheetNotFound gspread.exceptions.SpreadsheetNotFound Solved : In the json file, there is a "client_email". You need to share your file with this email. 
Read more

Miniconda installation problem: concurrent.futures.process.BrokenProcessPool: A process in the process pool was terminated abruptly while the future was running or pending.

We got error message shown as below: [/home/omicsacademy/miniconda3] >>> PREFIX=/home/omicsacademy/miniconda3 Unpacking payload ... concurrent.futures.process._RemoteTraceback: ''' Traceback (most recent call last):   File "concurrent/futures/process.py", line 368, in _queue_management_worker   File "multiprocessing/connection.py", line 251, in recv TypeError: __init__() missing 1 required positional argument: 'msg' ''' The above exception was the direct cause of the following exception: Traceback (most recent call last):   File "entry_point.py", line 69, in <module>   File "concurrent/futures/process.py", line 484, in _chain_from_iterable_of_lists   File "concurrent/futures/_base.py", line 611, in result_iterator   File "concurrent/futures/_base.py", line 439, in result   File "concurrent/futures/_base.py", line 388, in __get_result concurrent.futures.process.BrokenProc
Read more

转载：彻底搞清楚promoter, exon, intron, and UTR

Image
 • 启动子 : RNA 聚合酶特异性识别和结合的 DNA 序列。 • promoter 自然不属于 intron 和 Exon 的任何一个，属于 noncodingsequence 。         • noncoding  RNA 是现在研究的热点之一。我们常见的 MiRNA,SiRNA ,antisense RNA tech, 这些都是属于 ncRNA 的范围。只要你在进一步问下：这些 RNA 是哪里来的？你就知道部分答案，跟那些看似跟编码蛋白没有关系的 DNA 序列有关系。这部分 DNA 有个统称就 junk DNA ，垃圾ＤＮＡ或者冗余 DNA ，他们编码的 RNA 就属于  ncRNA . RNAi 就是迄今最经典的 ncRNA 功能典范。         • An  exon  is asequence of DNA that is expressed (transcribed) into RNA and then often, butwith many noteworthy exceptions[1] , translated into protein. Adjacent  exons  maybe separated by an  intron , which is later removed from the RNAtranscript via the splicing mechanism.  (From Wikipedia)         • UTR （ UntranslatedRegions) 即非翻译区，是信使 RNA （ mRNA ）分子两端的非编码片段。 　         • 5'-UTR 从 mRNA 起点的甲基化鸟嘌呤核苷酸帽延伸至 AUG 起始密码子， 3'-UTR 从编码区末端的终止密码子延伸至多聚 A 尾巴（ Poly-A ）的末端。    转录（Transcription）是遗传信息从DNA到RNA的转移。即以双链DNA中的一条链为模板，以ATP、CTP、GTP和UTP4种核苷三磷酸为原料，在RNA聚合酶催化下合成RNA的过程。 常见问题： 问： Promoter 在 DNA 序列中是算内含子还是外显子？ 答：都不是。 属于 noncoding sequen
Read more