git - Is there a better way to accomplish the combination reset, checkout, cherry-pick, checkout, rebase? -


suppose have following history:

a ─▶ b  -- master       ╲        ◀         c ─▶ d ─▶ e  -- feature

at point e, stuble upon small bug in code has strictly speaking nothing feature, happens important @ point, though went unnoticed. i'll first of fix right in place:

a ─▶ b  -- master       ╲        ◀         c ─▶ d ─▶ e ─▶ f  -- feature                        ⋮                        fix bug

but, since after bug has not feature such, isn't history want – fix should right in master (if not in dedicated bugfix branch).

git checkout master git cherry-pick f  ─▶ b ─▶ f'  -- master       ╲        ◀         c ─▶ d ─▶ e ─▶ f  -- feature

ok, fine, can't leave @ (or can i?) – f occurs 2 times in active branches yet want merge. could

git checkout feature git reset --hard head^  ─▶ b ─▶ f'  -- master       ╲        ◀         c ─▶ d ─▶ e  -- feature

and wait f' when merging feature master, won't because don't have bugfix available right need – work on feature. i'll finish off with

git rebase master  ─▶ b ─▶ f'  -- master            ╲             ◀              c' ─▶ d' ─▶ e'  -- feature

this feels complicated , error-prone way of achieving goal, moving single commit in history.

is there more straghtforward way accomplish task?

summary

in opinion easiest way fix bug directly on master (or in bugfix branch based on master). after master includes bugfix can rebase feature branch onto master. done.

detailed flow (with bugfix branch)

bugfix branch:

git checkout master && git checkout -b bugfix  * 98f2c4f (head -> bugfix) bugfix commit | * efe77fd (feature1) test2 |/ * 3c3a2ee (master) test

merge bugfix master , delete bugfix:

git checkout master && git merge bugfix && git branch -d bugfix  * 98f2c4f (head -> master) bugfix commit | * efe77fd (feature1) test2 |/ * 3c3a2ee test

rebase feature branch onto master:

git checkout feature1 && git rebase master  * e3a55ed (head -> feature1) test2 * 98f2c4f (master) bugfix commit * 3c3a2ee test

-

Comments

Post a Comment

Popular posts from this blog

unity3d - Rotate an object to face an opposite direction -

i have object , b. when click on object b, rotates object b (a faces b). b doesn't face a. need following : when faces b, need face opposite direction. have code rotating @ b. how rotate face opposite direction after that? vector3 targetdirection = target - transform.position; float step = speed * time.deltatime; vector3 newdirection = vector3.rotatetowards (turretdome.transform.forward, targetdirection, step, 0.0f); turretdome.transform.rotation = quaternion.lookrotation (newdirection); you object facing object b, want inverse direction of object after that? objecta.transform.rotation = quaternion.inverse(objecta.transform.rotation) but lets assume example turretdome object a, (negate direction): turretdome.transform.rotation = quaternion.lookrotation (-newdirection); naturally, both of these snippets not show how smoothen rotation, seem know how use time.deltatime. just incase unsure, quaternion.lerp this
Read more

angular - Is it possible to get native element for formControl? -

i've got angular2 reactive form . created formcontrol s , assigned input fields by [formcontrol]=... . understand creates nativeelement <-> formcontrol link. my question: possible nativeelement formcontrol ? wanna myformcontrol.nativeelement.focus() i can share 1 terrible solution works me. in reactive forms can use either 1) formcontroldirective ts mycontrol = new formcontrol('') template <input type="text" [formcontrol]="mycontrol"> or 2) formcontrolname ts myform: formgroup; constructor(private fb: formbuilder) {} ngoninit() { this.myform = this.fb.group({ foo: '' }); } template <form [formgroup]="myform"> <input type="text" formcontrolname="foo"> </form> so these directives write patch like 1) formcontroldirective const originformcontrolngonchanges = formcontroldirective.prototype.ngonchanges; formcontroldirective.proto
Read more

javascript - Why jQuery Select box change event is now working? -

i working on product filters user select select box according his/her preference not getting selected value user in jquery. html code:- <select name="product_filter" id="product_filter"> <option value="price_low_first">price : low high</option> <option value="price_high_first">price : high low</option> <option value="latest">latest</option> <option value="popular">most popular</option> </select> jquery code: $(function () { $("#product_filter").change(function () { alert("hi") var selectedtext = $(this).find("option:selected").text(); var selectedvalue = $(this).val(); alert("selected text: " + selectedtext + " value: " + selectedvalue); }); }); hi believe code perfect. once please check jquery.min.js
Read more