Your doing it wrong11/19/2022 The short-lived feature branch should only last a day or two and never diverge from the trunk enough so that a Duration of ‘short-lived’ feature branches Maybe the business people on the teamĬherry-picking every commit since the branch-cut to the branch from the trunk is the same thing of course. That is not right - it seems like they cut the branch on the wrong day. BUT in the days that lead up to the release, they are also doing general merges up to the release branch from The developers cut a release branch because their release cadence is low, and they’re hardening and certifying the release Merging rather than cherry-pick to/from a release branch Reproduce it on the release branch, fix it there, and merge back. If you can not reproduce bugs on the trunk (truly rare), then you have permission to go ahead and Happen from that, a second confirmation that the issue has been remediated, and that deployment should go live (perhapsĪ point release). Then egg on face, and recriminations.īugs should be reproduced and fixed on the trunk, and then cherry-picked to the release branch. Release moment (fresh branch cut from the trunk). There is a chance you might forget to merge it down, and then there is going to be a regression at the next Your releaseĬadence is infrequent enough to allow you to cut a release branch on a just in time basis and then harden that in the runīut, if you are fixing bugs on the release branch and merging them down to the trunk you are doing Cherry-pick of bug fixes from release branches to the trunkĪll your developers are using a trunk and they are doing the right thing with respect to not breaking the build. Not the Trunk-Based Development branching model. “We merge branches back to trunk often” can be heard a lot in the industry,Īnd if you are grouping multiple developers on those branches of they not deleted after a couple of days, then it is Mean you are doing Trunk-Based Development. The mere fact that you have a branch called trunk does not Give you ‘trunk’, ‘tags’ and ‘branches’ as directory names. Say you are using Subversion, and you accepted its default directory design, when you made a new repository. You're doing it wrong Merely naming a branch trunk.
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |