1
I’m working on a remote git, and I have a remote I’m trying to push to send my new changes to the other remotes (in this case join origin/master) and even send a PULL or Pull from upstream on the PUSH screen gets caught on the image screen 
advancing already hangs on the screen, what I want to do: give a PULL, MERGE and then send my new files with PUSH. How to proceed? I am using NetBeans IDE 8.0 (windows).
EDITED:
the error that after this screen is this one: 
ai in the 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
Sorry for the obvious question, but you’re not getting the mark
checkbox[ ] master->master?– rubStackOverflow
sorry the question imcompleta edited, the error is the photo above
– Matheus Silva Itep
Show this output ai.
– Edgar Muniz Berlinck
is up there, I remembered I had not put the same and I edited 1 minute ago, rs
– Matheus Silva Itep
Boy, I had a problem like that yesterday, but at the eclipse. Saves the file(s) that needs to merge, deletes, downloads again and overwrites with the backup you made. As much as I did the merge and marked it as
mergedeclipse did not understand that the merge was done. Sometimes it may be the same problem...– Edgar Muniz Berlinck