linux - Git revert a commit that has some other commit depending on it -


let's have commit a , b, , b depends on a's modification. want revert a, successful? also, happen if line added 'a' no longer present?

git report revert resulted in conflict. git status show unmerged paths.

you can resolve conflict other.

edit example:

$ mkdir foo $ cd foo $ git init $ echo "this line in file" > blah $ echo "this second line in file" >> blah $ echo "this third line in file" >> blah $ git add blah $ git commit -m "first commit" # edit second line in blah $ git commit -am "second commit" # remove second line blah $ git commit -am "third commit" $ git revert head^ #revert second commit error: not revert 4862546... change hint: after resolving conflicts, mark corrected paths hint: 'git add <paths>' or 'git rm <paths>' hint: , commit result 'git commit' $ git status # on branch master # unmerged paths: #   (use "git reset head <file>..." unstage) #   (use "git add <file>..." mark resolution) # #   both modified:      blah # no changes added commit (use "git add" and/or "git commit -a")

in case first commit added file , second modified file, git status show this:

$ git status # on branch master # unmerged paths: #   (use "git reset head <file>..." unstage) #   (use "git add/rm <file>..." appropriate mark resolution) # #   deleted them:    blah #

Comments

Post a Comment

Popular posts from this blog

basic authentication with http post params android -

i doing basic authentication passing username , password , using basicnamevaluepair sending post params response service. my method: public stringbuilder callservicehttppost(string username, string password, string type) { // create new httpclient , post header httpclient httpclient = new defaulthttpclient(); httppost httppost = new httppost(webservice + type); httpresponse response = null; stringbuilder total = new stringbuilder(); try { url url = new url(webservice + type); /*string base64encodedcredentials = base64.encodetostring((username + ":" + password).getbytes(), base64.url_safe | base64.no_wrap);*/ string base64encodedcredentials = "basic " + base64.encodetostring( (username + ":" + password).getbytes(), base64.no_wrap); httppost.setheader("auth...
Read more

vb.net - Virtual Keyboard commands -

i wondering difference between virtual these keyboard commands is: keyeventf_extendedkey , keyeventf_keyup is. everywhere have looked gives me description based off integers , not want know each of them does. you've tagged question vb.net, these have nothing @ vb.net. they're constants defined in windows header files, use win32 api functions. as far difference, can't tell looking @ values. individual values not particularly important, that's why named identifiers used. what's important used , documentation functions tells mean. the first one, keyeventf_extendedkey , used keybdinput structure (which used along e.g. sendinput function) pass information synthesized keyboard input. if flag used, means scan code should interpreted extended key. technically, means scan code preceded prefix byte value 224 (&he0 in hexadecimal notation). the second one, keyeventf_keyup , 1 of flags available use structure. means key being released (going up)...
Read more

c++ - End of file on pipe magic during open -

i have c++ application in starting process(wireshark) following. if (fp == null){ fp = popen(processpath, "r"); //processpath process want start if (!fp){ throw std::invalid_argument("cannot start process"); } fprintf(fp, d_msg);//d_msg input want provide process } else if(fp != null){ fprintf(fp, d_msg); } the problem when execute c++ application, start wireshark error end of file on pipe magic during open what should avoid that? also tried using mkfifo create named pipe , execute it. used this: if (fp == null){ system("mkfifo /tmp/mine.pcap"); fp = popen("wireshark -k -i /tmp/mine.pcap", "r"); if (!fp){ dout << "cannot start wireshark"<<std::endl; throw std::invalid_argument("cannot start wireshark"); } input = fopen("/tmp/mine.pcap", "wb"); fprintf(input , d_msg); fclose(input)...
Read more