git - How can I remove merged branch which is already push to origin -

-

for example, have 1 defect issue ,which developer create new branch, , fixed in branch name "fix_#1_backyard_data_displayed". then, merge branch "beta" test it. after while, tester merged branchs "fix_2" , "fix_3" "fix_20" "beta" , test it. after that, found first merged "fix_#1_backyard_data_displayed" branch buggy , make our application unstable.

now, how can remove merged branch push origin without disturbing "fix_2" , "fix_3" "fix_20"?

short answer

in beta branch:

  1. find sha1 of commit corresponds merge.
  2. run git revert <sha1> -m 1

there caveat: git still think feature branch merged beta branch, , merge branch again you'll need revert (again) commit introduced git revert before merging.

longer version

the command in git undo commit revert. merge commits, need specify "mainline" branch -m switch. in case, should 1:

usually cannot revert merge because not know side of merge should considered mainline. option specifies parent number (starting 1) of mainline , allows revert reverse change relative specified parent.

reverting merge commit declares never want tree changes brought in merge. result, later merges bring in tree changes introduced commits not ancestors of reverted merge. may or may not want.

see revert-a-faulty-merge how-to[1] more details.

(source: git revert)

the following sh script demonstrates this. first revert command reverts commit merged fix1 branch, in case second-to-last commit, i.e., head^. after reverting, before merging fix1 branch again, revert needs undone revert command:

#!/bin/sh  git init test cd test  touch git add git commit -m  git checkout -b fix1 touch b git add b git commit -m b  git checkout -b fix2 master touch c git add c git commit -m c  git checkout master git merge --no-ff --no-edit fix1 git merge --no-ff --no-edit fix2  git revert --no-edit head^ -m 1  git checkout fix1 echo "fix b" > b git add b git commit -m bb  git checkout master # git merge fix1 # give error!  # revert changes introduced revert before merging git revert --no-edit head git merge --no-ff --no-edit fix1

Comments

Post a Comment

Popular posts from this blog

yii2 - Yii 2 Running a Cron in the basic template -

-
i have seen instructions on running cron in advanced template, cant figure out how on basic template. have following controller in basic controllers folder. <?php namespace app\controllers; use yii\console\controller; /** * cron controller */ class croncontroller extends controller { public function actionindex() { echo "cron service runnning"; } public function actionmail($to) { echo "sending mail " . $to; } } i have navigated root of application , tried these comands yii cron php yii cron im getting unknown comand "cron" i know old question failed find actual answer this. if @ code yii exec file you'll notice requires /common/config/aliases.php file console/config/main.php. can naturally change these or copy on these advanced template. hope solves problem wanting same thing.
Read more

asp.net - 'System.Web.HttpContext' does not contain a definition for 'GetOwinContext' Mystery -

-
i realize question might seem trivial some, it's these types of things find myself fighting quite bit , want make sense of despite seeming losing battle in .net (for me anyway). so, if following: using system.web; ... applicationuser user = system.web.httpcontext.getowincontext().getusermanager<applicationusermanager>().findbyid(system.web.httpcontext.user.identity.getuserid()); that produces error in title , red getowincontext() , error cannot resolve symbol 'getowincontext()' however, if following (remove system.web in front of httpcontext ), works expected (or @ least no errors): using system.web; ... applicationuser user = httpcontext.getowincontext().getusermanager<applicationusermanager>().findbyid(system.web.httpcontext.user.identity.getuserid()); however, if (same line that's working using system.web commented out): //using system.web; ... applicationuser user = httpcontext.getowincontext().getusermana...
Read more

mercurial graft feature, can it copy? -

-
there new feature in mercurial 3, called 'graft' (graft local). job of moving change-set different branch. is there way "copy" change-set branch? i interested in in moving stuff qa branch production branch, still need code reside in qa. want copy. found , have tried few things, maybe it'll become clear more tinkering , reading... does have better way of 'cherry picking' change-sets move cross branch (or trunk)??? graft copies changesets, doesn't move them. hg graft (emphasis mine): this command uses mercurial's merge logic copy individual changes other branches without merging branches in history graph. known 'backporting' or 'cherry-picking' . default, graft copy user, date, , description source changesets.
Read more