'Fatal: cherry-pick failed' with Git -

-

i working on branch x. made commit , pushed it.

then wanted cherry-pick branch y. due unmerged files present, got following message:

error: 'cherry-pick' not possible because have unmerged files. hint: fix them in work tree, hint: , use 'git add/rm <file>' hint: appropriate mark resolution , make commit, hint: or use 'git commit -a'. fatal: cherry-pick failed

now, want delete branch y, re-create branch y , want manually edit file trying cherry-pick.

currently, i'm unable delete branch working branch. cannot checkout other branch. i'm getting following error on trying change branch. 

mod/assign/locallib.php: needs merge error: need resolve current index first

i need delete branch y, without losing on branch x.

edit #1

i edited file mod/assign/locallib.php

on doing git status, get:

# on branch mdl-38267_24 # unmerged paths: #   (use "git add/rm <file>..." appropriate mark resolution) # #   both modified:      mod/assign/locallib.php #

what file should add in git add .. ?

since have edited conflict file, need 

git add mod/assign/locallib.php

then 

git cherry-pick --continue

Comments

Post a Comment

Popular posts from this blog

java - Jmockit String final length method mocking Issue -

-
using jmockit 1.2 jar, trying mock string's length method getting unexpected invocation exception: failed: test java.lang.illegalstateexception: missing invocation mocked type @ point; please make sure such invocations appear after declaration of suitable mock field or parameter @ stringdemo.testa$1.<init>(testa.java:17) @ stringdemo.testa.test(testa.java:13) i using testng: @test public void test() throws exception { new expectations() { @mocked("length") string astring; { astring.length(); result = 2; } }; system.out.println(a.showa("test")); } } actual class a: public class { public static int showa(string str){ int a= str.length(); return a; } } this wrong way of recording expected results. shouldn't mock , record string's length() method, record showa() instead. here solution @suppresswarnings("unused&qu
Read more

asp.net - Razor Page Hosted on IIS 6 Fails Every Morning -

-
i have simple page in intranet uses razor/asp fetch single record table , display it, plus few graphic, dashboard display. meaning, no user intervention other first time open ie internal url. the problem having every morning ie displays "page not found or network error" message. refresh page, , it's stuck , doesn't display anything. try different pc, open ie internal url , it's stuck... ...until following: login server hosting page run inetmgr go web sites, etc right click on page that's giving me problem , select browse at moment, error message: server error in '/' application. -------------------------------------------------------------------------------- type of page not served. description: type of page have requested not served because has been explicitly forbidden. extension '.cshtml' may incorrect. please review url below , make sure spelled correctly. requested url: /application/dashboard.cshtml ---------------
Read more

c++ - wxwidget compiling on windows command prompt -

-
can please guide me on method,as how compile wxwidget using windows command prompt or msys. [i can't seem find on wxwiki/wxwidget official book/anywhere else] i have compiled wxwidget instructions have provided (using msys). from searching on internet seems 1 can (maybe?) through use of makefile (is correct?) if yes: directory & how should link wx libraries in makefile if no: way besides makefile? i know can use ide's code::block , make life simpler prefer compile using command prompt/msys. thanks in advance.
Read more