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

c++ - Function signature as a function template parameter -

-
i'd use function signature template argument. works great classes, when try same trick function templates, msvc throws error: error c2768: 'func' : illegal use of explicit template arguments here's code: template <typename signature> void func(); template <typename r, typename a1> void func<r(a1)>(); what should make work? you cannot partially specialize function template, not supported language. can create partially specialized class template static member function, , possibly trampoline function instantiate class template , invoke static function. something this: namespace detail { template<typename signature> struct helper; template<typename r, typename a1> struct helper<r(a1)> { static void call() { // stuff r , a1... } }; } template<typename signature> void func() { detail::helper<signature>::call(); }
Read more

algorithm - What are some ways to combine a number of (potentially incompatible) sorted sub-sets of a total set into a (partial) ordering of the total set? -

-
i have sorting problem i'm pretty sure doesn't have canonical "answer" - has number of different approaches, each pros/cons. i'm interested in hearing different approaches. suppose bunch of people {p_i | i=1,...,m} ranking favorite ice cream flavors. in total there n different flavors, single person p_i ranks n_i << n flavors or familiar with. i'm interested in combining these sub-rankings plausible overall ranking of n flavors. for concrete situation: m , n both 1000 (by coincidence), , each n_i 20 . can assume there's enough overlap in flavors people rank such no flavor "isolated". again, i'm interested in hearing different ways approach this, if there isn't single clear answer. thanks! one way approach problem construct directed cyclic graph representing of constraints on ordering of elements. nodes in graph represent different elements compared , have edge first node second node if had ranked first e...
Read more

How to call a javascript function after the page loads with a chrome extension? -

-
there's function on page want call after loads. not own page, can't insert html it. can please provide specific examples how chrome extension or greasemonkey? (function submitaction() ). both chrome extensions , greasemonkey offer ways specify when script inject if executed. in chrome extension, you set in manifest : "content_scripts": [ { "run_at" : "document_idle", in greasemonkey compatible userscripts, set in metadata // @run-at document-end in both cases, have add script if want ensure resources loaded when function executed : document.addeventlistener('load', submitaction);
Read more