GIT pull conflict: how come not on any branch? -

-

i have branch checked out , edit , commited file. in meanwhile, else pushed changed same file.

when git pull, see

first, rewinding head replay work on top of it... applying: add new line applying: create 1 conf using index info reconstruct base tree... falling patching base , 3-way merge... auto-merging <filename> conflict (add/add): merge conflict in <filename> recorded preimage '<filename>' failed merge in changes. patch failed @ 0002 create 1 conf when have resolved problem run "git rebase --continue". if prefer skip patch, instead run "git rebase --skip". restore original branch , stop rebasing run "git rebase --abort".

i tried manually resolve conflict in file, see not on branch. wondering why happening.

git status # not on branch. # untracked files:

this normal. need fix file , follow rebase instructions - --continue.

you resolve issue by

  1. edit files resolve conflict
  2. perform git checkout --ours -- <filenames> if know version good
  3. perform git checkout --theirs -- <filenames> if theirs good.

follow of these git add <filenames>. note --ours , --theirs can swapped in cases might expect; check file checked-out if use options 2 or 3.

conclude git rebase --continue (which commit you). if decide abort sure use git rebase --abort git can out of 'not on branch' condition.


Comments

Post a Comment

Popular posts from this blog

Perl - how to grep a block of text from a file -

-
it can in xml or text format. how in general grep block of text in perl? <track type="ws"> <range> <rangestart>0</rangestart> <rangeend>146.912</rangeend> <locationindex>0</locationindex> <propertyindex>0</propertyindex> </range> </track> <track type="ps" id="1"> <range> <rangestart>0</rangestart> <rangeend>146.912</rangeend> <locationindex>1</locationindex> <propertyindex>1</propertyindex> </range> </track> i want grep type="ps" , till </range> . one solution open file, read line line , match block. open(fh, "file.txt"); foreach $line (<fh>) { if ($line =~ m/type="cc"(.*?)<\/range>/) { print $1; } } but there more optimal solution without reading file line l
Read more

delphi - How to remove all the grips on a coolbar if I have several coolbands? -

-
Image
if set mycoolbar.fixedorder true,only grip on first band hidden. well,if use delphi 7 create vcl forms application,then put coolbar on , create 3 coolbans hold other controls,only grip , top coolbands can hidden setting mycoolbar.fixedorder:=true. i've uploaded picture make things clear. you got fixedorder property wrong. fixed property not allow bands rearranged if set true . setting property of coolbar true keep user changing bands order @ runtime, user can still move , resize bands. can give advice can do, actual solution problem, well, have wait answer. my advice use 3 coolbars in row , setting "fixedorder" property true , bandborderstyle bsnone . way grip hidden on of them. about property, it's not bug of ide, actual preference of property.
Read more

javascript - Animating array of divs; only the final element is modified -

-
this baffling me @ moment. i'm experienced programmer looking throw bit of surprise fiancee on countdown page our wedding. desired effect simulated confetti falling behind main page. setup follows: i have array of divs in javascript. each div absolutely positioned on page. have interval set updates every 50 or milliseconds. on each tick, run loop on array of divs, , calculations , update positions. problem problem having, however, though can see divs created, stored array, , modified (in case, each has slight randomized rotation) during initialization phase, once tick update position starts, div stored in whatever last slot of array gets position updated. tried hard-coding each div index testing purposes, strictly last element update position. upon printing current "left" , "top" style values each div before , after calculations shows value has been changed, no visible change noticeable. here's basic code: javascript var container;
Read more