I am working on a remote git, and I have a remote in which I am trying to do PUSH to send my new changes to the remote ones (in the case of joining origin / master) and even sending a PULL
or Pull from upstream
on the screen PUSH gets stuck on the image screen Advancealreadyhangsonthescreen,whatIwanttodo:giveaPULL,MERGEandthensendthemynewfileswithPUSH.HowtoproceedI'musingNetBeansIDE8.0(windows).
EDIT:theerrorthatafterthisscreenisthisone:
ai no output ....
Remote Repository Updates
Branch Update : master
Old Id : 0000000hgfh0000fdffgg1f32g1fdg2fd1gd1g2fd
New Id : 0000dsadda000hgfh06546f32g1fdg2fd1gd1g2fd
Result : REJECTED_NONFASTFORWARD
Local Repository Updates
Branch Update : origin/master
Old Id : 0000000hgfh0000fdffgg1f32g1fdg2fd1gd1g2fd
New Id : 0000dsadda000hgfh06546f32g1fdg2fd1gd1g2fd
Result : NOT_ATTEMPTED
==[IDE]== 24/06/2015 21:54:14 Pushing