Commit dc74482

committed

task primer: minor changes on maint creation

1 parent ea43dda commit dc74482Copy full SHA for dc74482

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -224,12 +224,12 @@ $ git checkout `maint`
`224`	`224`	`(maint) $ git branch maint-2.6.4`
`225`	`225`	```
`226`	`226`
`227`		`-Make a new maintenance branch:`
	`227`	`+Update the current maintenance branch:`
`228`	`228`
`229`	`229`	```
`230`	`230`	`$ git checkout maint`
`231`	`231`	`(maint) $ git merge --ff-only master`
`232`		`-(maint) $ git push --set-upstream origin +maint`
	`232`	`+(maint) $ git push origin maint`
`233`	`233`	```
`234`	`234`
`235`	`235`	NOTE: If the merge fails because the branch cannot be fast-forwarded, then it is possible some fixes on `maint` were

Comments

(0)