Patch forked repo with git -

-

say, have fork of library ver. 1.1 under git. new tar-ball ver. 1.2 comes out. how can update forked library new version?

you question isn't great, i'll offer potential solution.

lets assume code base library looks this:

vendor  -- b

you fork @ b 1.1 release.

vendor  -- b               \                \             1 -- 2 -- 3

now assuming development continues on vendor tree.

vendor  -- b -- c -- d               \                \ (master)    1 -- 2 -- 3

and d becomes 1.2 release. if vendor tree in git repo , can access it, git pull or maybe git pull --rebase vendor tree should things need, may need resolve conflicts etc. if vendor tree not in git, , access have source code tarballs of each release more complicated might required.

so create second branch @ point @ forked, doing:

$ git checkout -b v1.2 b

then untar v1.2 tarbar branch , commit changes. should have this:

vendor  -- b -- c -- d              |\              | \ (master) |  1 -- 2 -- 3               \ (v1.2 branch)  x

now, either can merge changes branch v1.2 using:

$ git checkout master $ git merge v1.2

or can rebase changes on top of v1.2 using:

$ git rebase v1.2

which give you:

vendor  -- b -- c -- d               \                \ (master)    x -- d -- 1 -- 2 -- 3

i'm no expert, i'm sure people comment if i've made mistakes (please do, i'll add corrections).


Comments

Post a Comment

Popular posts from this blog

c# - How to set Z index when using WPF DrawingContext? -

-
how set z-index drawing object when using drawingcontext.drawxxx() methods? the object drawn last have higher z index. can't change index of drawn objects. way draw in order. if using wpf (as placed tag), can use, example, canvas control. create shapes need like polyline obj = new polyline(); //... // ... set properties of obj and add them canvas uielementcollection: yourcanvasname.children.add(obj); //or yourcanvasname.children.insert(i, obj); first items of collection have higher z index. advantages in way: no need redraw on window changes, can anytime move objects , change order.
Read more

razor - Is this a bug in WebMatrix PageData? -

-
i think may have found bug in webmatrix's pagedata, not sure. concerns how pass data partial page calling page. in webmatrix documentation (tutorials, e.g. " 3 - creating consistent look ", , example code), pagedata recommended mechanism pass data between pages (e.g. content page layout page, or partial page). however have found not work other way, pass data partial page calling page. modifying or adding entries in pagedata in partial page, not seem calling page. cutting right down simplest possible example, in test page may have this: @{ pagedata["test"] = "initial entry"; } <p>before calling partial page, test value @pagedata["test"]</p> @renderpage("_testpartial.cshtml") <p>after returning calling page, test value @pagedata["test"]</p> and in _testpartial.cshtml page might have this: @{ pagedata["test"] = "modified entry"; } <p>in partial page...
Read more

visual c++ - Using relative values in array sorting ( asm ) -

-
i need sort through array , sort each individual row in array in ascending order. doesn't seem going (surprise!) keep getting hit 2 errors: a2101: cannot add 2 relocatable labels , a2026: constant expected here's sort, makes sense me, think i'm still trying implement high-lvl language techniqes assembly. there way around not being able use relative values? (the array 7 rows 9 columns, btw). mov cx, 7; cx = number of rows outer: ; outer loop walk through rows push cx mov cx, 9 mov row, cx ;rows middle: ; middle-loop walk through columns push cx sub cx, 1 ;cx = cx-1 mov column, cx ;columns inner: ;inner loop - compare , exchange column values cmp marray[row*9 + column], marray[row*9 + column+1] xchg marray[row*9 + column+1], marray[row*9 + column] ; compare , exchange values marray table inc column loop inner pop cx loop mid...
Read more