Just squashed with git rebase, now can't push that squash to remote, says everything is up to date -


I need to squash the last 2 commands in one, which I have successfully written to git rebase -i HEAD ~ 2 With . git push master master I found: update everything

thanks for any help

"post-text "Itemprop =" text ">

got it to work

git push --force Basic Master


-

Comments

Post a Comment

Popular posts from this blog

Python Equivalent for matlab cart2pol and pol2cart -

I would like to use pol2cart and cart2pol for two functions in MATLAB. Is there an equivalent Python Function? Or if we can define work? For example, I tried to use the CeMatePactor function, but it only accepts one argument, I have 2 arguments to cross the polar and REC function. P> I have tried to use this function for cart2pol: def cart2pol (x, y): theta = atan2 (y, x) rho = Sqrt (x ** 2 + y ** 2) returns (theta, ro) thanks
Read more

javascript - Render HTML after each iteration in loop -

I'm trying to gradually increase the font size of text on a web page. The code works in my place, although the new HTML / CSS does not render after every iteration of the loop and when all this is done, then display only the text of 100 px size. To see the text as if it is slowly zooming, I need to do this JavaScript is down because it is being used from a different file here is what I have ... & lt; P class = "game-title" style = "font-size: 50px" & gt; Test & lt; / P & gt; Function sleep (milliseconds) {var start = new date (). GetTime (); For (var i = 0; i & lt; 1e7; i ++) {if ((new date). GetTime () - start) & gt; Milliseconds {break; CSS ('font-size', 'parseInt ($ (' game-title '). CSS (' font-size ')) + 1 + "pixels"); } While (parasont ($ ('# text'). Css ('font-size')) & lt; = 100) {sleep (1000); IncreaseSize (); Using CSS: Use of jQuery (sample): $ ('...
Read more

sip - Call SipJs to Asterisk 12 -

I am trying to call Asterisk 12 from SIPJ. My partner is here [6002]] type = friend secret = 6002 host = dynamic reference = public transport = ws avpf = yes icesupport = no encryption = no And my JSP code is here var configuration = {'ws_servers':' ws: //192.168.0.102: 8088 / ws', 'Yuri': 'SIP: 6002 @ 192.168.0.102 ',' Password ':' 6002 '}; Var option = {'EventHolders': EventHandler, 'Media Consultants': {'Audio': True, 'Video': Incorrect}}; Function call () {quietphonecall ('sip: 6003@192.168.0.102', option); } It is properly registered, but when I call "call" function asterisk logs this error secure without encryption details Rejecting Audio Stream: Audio 46421 RTP / SAVPF 111 103 104 0 8 106 105 13 126 JSSIp error is here Call failed with reason: Incompatible SDP Can someone help me? First of all, you will have to create a certificate for DTLS. Then enabl...
Read more