Commit ea43dda

committed

task primer: update method of moving maint forward

Fixes Issue #9

1 parent d16c511 commit ea43ddaCopy full SHA for ea43dda

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -228,10 +228,14 @@ Make a new maintenance branch:`
`228`	`228`
`229`	`229`	```
`230`	`230`	`$ git checkout maint`
`231`		`-(maint) $ git reset --hard v2.7.0`
	`231`	`+(maint) $ git merge --ff-only master`
`232`	`232`	`(maint) $ git push --set-upstream origin +maint`
`233`	`233`	```
`234`	`234`
	`235`	+NOTE: If the merge fails because the branch cannot be fast-forwarded, then it is possible some fixes on `maint` were
	`236`	+missed in the feature release, and are not on `master`. This will not happen if the content of the branches was
	`237`	`+verified as per the earlier instructions.`
	`238`	`+`
`235`	`239`	`You will likely now wish to <<RewindRebuildNext>> and <<RewindRebuildPu>>.`
`236`	`240`
`237`	`241`	`===== Examples`

Comments

(0)