Rollback last "git pull upstream" (conflict occurs) into the old state -

-

i did update file , committed changes (efe5e5d (head, master) change caption), fired git pull upstream while upstream's code changed recently, of course caused me conflict.

git show-ref

efe5e5d65603419288e40b8e964aecba4626c99f refs/heads/master 879020dbcd1cf1f797577b66a9416c1007a1ad29 refs/remotes/upstream/head 20e54d8ccaa4dba7890fa5db2e89394ab33a0c81 refs/remotes/upstream/dev 879020dbcd1cf1f797577b66a9416c1007a1ad29 refs/remotes/upstream/master

the conflicted file (index.html)

<<<<<<< head     <a href="about.html" class="btn btn-success">goto about</a> =======     <a href="about.html" class="btn btn-success">about page</a> >>>>>>> 879020dbcd1cf1f797577b66a9416c1007a1ad29

git status

your branch , 'upstream/master' have diverged, , have 1 , 1 different commit each, respectively.   (use "git pull" merge remote branch yours)  have unmerged paths.   (fix conflicts , run "git commit")  unmerged paths:   (use "git add <file>..." mark resolution)          both modified:   index.html

git log

* efe5e5d f72465f (head, master) change caption      * f72465f 28645ce add link button                          * 28645ce 48c2640 20e54d8 merge branch dev'

question how rollback last git pull upstream old state?

the purpose of learn, it's not real code. think cannot use git reset, think following related.

  1. git update-ref refs/remotes/upstream/master refs/remotes/upstream/master@{1}
  2. git checkout -- index.html (i'm not sure because git status suggest this)
  3. what should refs/remotes/upstream/head ?

please guide thanks.

edited

i think have found solution problem.

  1. git merge --abort
  2. git update-ref refs/remotes/upstream/master refs/remotes/upstream/master@{1}

with these 2 commands, can fire git pull upstream again never happenned before.

while doing git pull, tracking branch updated , merge performed between remote branch , local branch. if conflict occurs, merge stops in between allowing resolve them , git commit. have @ this: 

you have unmerged paths.   (fix conflicts , run "git commit")

the merge finishes after git commit. so, return state branch before git pull upstream, you'll have hard reset since changes still unmerged.

git reset --hard

it remove staged changes. remove conflicted files also(which unstaged), following.

git add index.html git reset --hard

Comments

Post a Comment

Popular posts from this blog

c - Bitwise operation with (signed) enum value -

-
i using enumerator values flags: typedef enum { = 0x00, b = 0x01u, // u has no influence, expected c = 0x02u, // u has no influence, expected ... } enum_name; volatile unsigned char* reg = someaddress; *reg |= b; according misra-c:2004 bitwise operations shall not done signed type. unfortunately, compiler iar use signed int (or short or char) underlying type of enums, , option can find relates size, not signedness ("--enum-is-int"). according iar c/c++ development guide arm , pages 169 , 211, can define type of enum s if enable iar language extensions ( -e command-line option, or project > options > c/c++ compiler > language > allow iar extensions in ide). in particular, should define "sentinel" value, make sure compiler chooses correct type. prefers signed types, , uses smallest possible integer type, sentinel should largest positive integer corresponding unsigned integer type can describe. example, typedef enum
Read more

xslt - Unnest parent nodes by child node -

-
in xml there items 0-n attributes , item should copied each attribute new item 1 attribute. given xml this: <?xml version="1.0" encoding="utf-8" ?> <items> <item> <name>a</name> <attributes> <attribute> <key>attribute1</key> <value>1</value> </attribute> </attributes> </item> <item> <name>b</name> </item> <item> <name>c</name> <attributes> <attribute> <key>attribute1</key> <value>5</value> </attribute> <attribute> <key>attribute2</key> <value>2</value> </attribute> <attribute> <key>attri
Read more

YouTubePlayerFragment cannot be cast to android.support.v4.app.Fragment -

-
im stuck on 3 days , have tried have come across after lots of searching ,this post last resort, im trying open youtubeplayerfragment using navigation drawer youtubeplayerfragment cannot cast android.support.v4.app.fragment problem edit question : have updated code have used youtubeplayersupportfragment instead of youtubeplayerfragment ,i error in displayview method (case 4: fragment = new youtube(); break;) in main activity saying cannot convert youtube fragment , cannot logcat since cant run it edit question 2: code updated again have runtime problem ,heres logcat 07-22 22:15:09.782: e/androidruntime(20603): fatal exception: main 07-22 22:15:09.782: e/androidruntime(20603): process: net.frankandwalters, pid: 20603 07-22 22:15:09.782: e/androidruntime(20603): java.lang.nullpointerexception: attempt invoke virtual method 'void com.google.android.youtube.player.youtubeplayerview.a()' on null object reference 07-22 22:15:09.782: e/androidruntime(20603): @ com.goog
Read more