github - git non-fast-forward rejected with upstream -

-

i have git repo master set in upstream, , dev branch getting every stream master.

i have commited changes on dev branch useful specific branch , not master, , i

my current branch : 

git status on branch dev branch ahead of 'master' 2 commits.

my commits visible when 

git diff origin/master..head

my branch date ( , goes through master doing before) : 

git pull .  * branch            master     -> fetch_head up-to-date.

but when push, got bashed : 

git push origin https://my_git.git  ! [rejected]        dev -> dev (non-fast-forward) error: failed push refs 'https://my_git.git' hint: updates rejected because tip of current branch behind hint: remote counterpart. integrate remote changes (e.g. hint: 'git pull ...') before pushing again. hint: see 'note fast-forwards' in 'git push --help' details.

any tips appreciated, had on several posts : git push rejected non-fast-forward or git non-fast-forward rejected , none of them seems work in case.

thanks

your problem here:

git push origin

you did not specify branch push.
assuming using git <2.0 must set branches wish pull/push. in case trying push all branches , 1 of them generate error.

this for you

# latest changes remote git fetch --all  # merge changes local repository git pull origin dev   # push changes remote git push origin dev

git v2.0 release notes

backward compatibility notes

when "git push [$there]" not push, have used traditional "matching" semantics far (all branches sent remote long there branches of same name on there).

in git 2.0, default "simple" semantics, pushes:

  • only current branch branch same name, , when current branch set integrate remote branch, if pushing same remote fetch from; or

  • only current branch branch same name, if pushing remote not fetch from.

you can use configuration variable "push.default" change this. if old-timer wants keep using "matching" semantics, can set variable "matching", example. read documentation other possibilities.


Comments

Post a Comment

Popular posts from this blog

ruby - Trying to change last to "x"s to 23 -

-
i have been playing around irb , have string looks this: irb(main):072:0> puts ["[\"4354 5432 5432 xxxxx\", \"6547 6547 8543 xxxxx\", \"2344 6543 6674 xxxxx\", \"2346 6236 7543 xxxxx\", \"1273 5585 5587 xxxxx\"]"] => nil irb(main):073:0> what want gsub last 2 "x" s of each 17 digit combination, 23 . what i've tried far (i've been using rubular): a.gsub(/\d[x]/,"23") <= grabs "x" s i'm close a.gsub(/\w[x{2}]/,"23") <= grabs "x" s grabs two digits each combination. is there easier way i'm not understanding? a.gsub(/\d{4} \d{4} \d{4} xxx\kxx/, '23') \d{4} = 4 digits what \k drop matched far. can use don't replace entire number, still able validate have in desired format.
Read more

jquery - Clone last and append item to closest class -

-
this bare-bones code on page: <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <di...
Read more

css - Can I use the :after pseudo-element on an input field? -

-
i trying use :after css pseudo-element on input field, not work. if use span , works ok. <style type="text/css"> .mystyle:after {content:url(smiley.gif);} .mystyle {color:red;} </style> this works (puts smiley after "buu!" , before "some more") <span class="mystyle">buuu!</span>a more this not work - colors somevalue in red, there no smiley. <input class="mystyle" type="text" value="somevalue"> what doing wrong? should use pseudo-selector? note: cannot add span around input , because being generated third-party control. :after , :before not supported in internet explorer 7 , under, on elements. it's not meant used on replaced elements such form elements (inputs) , image elements . in other words it's impossible pure css. however if using jquery can use $(".mystyle").after("add smiley here"); api docs on .after to ...
Read more