Revert merge Git-Flow -


i'm using sourcetree , git-flow pattern. have prepared release beta-testers test created new release/v1.0.1 branch. mind slipped , decided finish (merge develop , master , tag) release though haven't sent out release testers. have release branch open again if testers finds bugs can fix these bugs in release branch , when bugs fixed can finish release.

so how can sourcetree preferably (or using git commands) revert state when had release/v1.0.1 branch?

attached screendump sourcetree:

enter image description here

edit: okay did git reset --hard head~2 on develop (head~2) because had tested manually checking out. when checkout master , git reflog seems me should reset on head~6 

peters-macbook-pro:remessage peterwarbo$ git reflog f7663b1 head@{0}: checkout: moving develop master 3d132da head@{1}: reset: moving head~2 2f1c753 head@{2}: checkout: moving master develop f7663b1 head@{3}: checkout: moving develop master 2f1c753 head@{4}: merge release/v1.0.1: merge made 'recursive' strategy. 4332fe4 head@{5}: checkout: moving master develop f7663b1 head@{6}: merge release/v1.0.1: merge made 'recursive' strategy. fe323ef head@{7}: checkout: moving release/v1.0.1 master 28a63ea head@{8}: commit: bumped version number 1.0.1

but when "error":

peters-macbook-pro:project peterwarbo$ git reset --hard head~6 fatal: ambiguous argument 'head~6': unknown revision or path not in working tree.

edit 2: new image illustrate fuckup.

enter image description here

edit 3: attached new image illustrate current state after issuing git commands in user1615903´s answer. why develop 2 behind? , why there merge release/v1.0.1 master though did reset master initial commit (fe323ef)?

enter image description here

this quite easy. things need are:

  • reset develop branch commit before merge

  • reset master branch commit before merge

  • have release branch point correct commit again

  • remove tag

  • push fixed commits remote

so steps 1 , 2:

git checkout develop git reset --hard 4332fe4  git checkout master git reset --hard <sha of commit master before merge>

then "recreate" release branch:

git checkout -b "release/v1.0.1" 28a63ea

and remove tag:

git tag -d v1.0.1

more information undoing merge in this stackoverflow question

after that, if changes pushed, need use -f switch override changes in remote:

git push -f

and delete tag remote:

git push --delete origin v1.0.1

Comments

Post a Comment

Popular posts from this blog

node.js - Bad Request - node js ajax post -

i'm using express 3.0 , node v0.11.0. have button submits form , i'm using ajax post data json object node server. client code is: $('#contact').submit(function(e) { console.log('submit called'); var formdata = json.stringify($('form').serializeobject()); console.log(formdata); $.ajax({ url: "http://localhost:3000/savedata/", type: "post", datatype: 'json', data: {objectdata: formdata}, contenttype: "application/json", complete: function() { console.log('process complete'); }, success: function(data) { console.log('process sucess'); }, error: function() { console.log('process error'); }, }); return false; }); then on server: var express = require('express'); var app = express(); app.set('views', __dirname + '/views'); app.set('view engine', 'jade'); app.use(express.bodyparser());...
Read more

Why does Ruby on Rails generate add a blank line to the end of a file? -

running rails generate controller foo home results in: class foocontroller < application controller def home end end (there's nothing on line in actual file, blank line) is there purpose blank line? it's common use newline indicate end of line, last line. many editors (like vi, use) add in newline silently. consensus text files (especially in unix world) should end in newline, , there have been problems historically if wasn't present. why should text files end newline? the tool used count lines in file "wc" counts newlines in file, without trailing newline show 3 instead of 4. it improves readability of templates used in generator. consider: https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/controller/templates/controller.rb to remove trailing newline, template have last line of: end<% end -%> instead of: end <% end -%> that seems less readable me. the discussion below refers ...
Read more

keyboard - Smiles and long press feature in Android -

i've created android keyboard. how add features inserting smilies, , using long keypresses display symbols? to create long-press behavior allows select several options pop-up menu, follow guide (specifically pop-up menu section): http://developer.android.com/guide/topics/ui/menus.html smileys (also known emoticons) combination of keys, understood programs , parsed same way. have do, when clicks smiley face on keyboard, simulate pressing of key combination matching emoticon. example, when clicks smiley, should simulate key presses ':' , ')' :). here's list of emoticons: http://en.wikipedia.org/wiki/list_of_emoticons
Read more