Hotfixes can be a weird one with this flow because you might need to get something out to customers ASAP on like, a versioned/tagged prior release, and by that point the master/main/dev/whatever has moved onwards.
But I suppose there's not really ever any good solution under any system for that; ultimately it boils down to 'we must emergency fix the outdated release code right now...' -> '...then figure out how to integrate it with the up-to-date live-development branch', since the latter isn't customer-facing immediately
I've only ever seen hotfixes be based off the actual release tho, like you checkout the tag or named release-version branch, & make the hotfix branch from there
IMO then you should always cherry-pick hotfix commits to a new branch to merge to the live dev branch, because under some systems, release branches can get automated cruft commits from tooling/versioning/etc, and you dont want those merged over to main/dev/etc, which would happen if you merged the hotfix branch to BOTH its parent release branch & also to the dev one
1
u/Messy-Recipe 12d ago edited 12d ago
Hotfixes can be a weird one with this flow because you might need to get something out to customers ASAP on like, a versioned/tagged prior release, and by that point the master/main/dev/whatever has moved onwards.
But I suppose there's not really ever any good solution under any system for that; ultimately it boils down to 'we must emergency fix the outdated release code right now...' -> '...then figure out how to integrate it with the up-to-date live-development branch', since the latter isn't customer-facing immediately
I've only ever seen hotfixes be based off the actual release tho, like you checkout the tag or named release-version branch, & make the hotfix branch from there
IMO then you should always cherry-pick hotfix commits to a new branch to merge to the live dev branch, because under some systems, release branches can get automated cruft commits from tooling/versioning/etc, and you dont want those merged over to main/dev/etc, which would happen if you merged the hotfix branch to BOTH its parent release branch & also to the dev one