News for hackers. Stuff that matters.

A comment on A note of reflection after 10 years of “A successful Git branching model”. Parent comment

Re:A note of reflection after 10 years of “A successful Git ... by woodrowbarlow on Thursday March 05, 2020 @03:48PM (#22498039)
the risk of this workflow is that PRs will languish for too long, and the work required to rebase them when they're actually needed will cause friction and mistakes. this will often manifest when your software reaches a certain level of maturity and you have established a release model that distinguishes between a release that includes only bugfixes and a release that introduces new features.

you definitely want to get your PRs merged in to _something_ as soon as they are complete, to avoid bitrot. but just because they're complete doesn't mean you want them included in the next release.

[ Parent | on HN ]
Re:A note of reflection after 10 years of “A successful Git ... by dtech on Thursday March 05, 2020 @04:41PM (#22498651)
> but just because they're complete doesn't mean you want them included in the next release.

That's the crux. Continous Delivery means exactly that. You want to release early, small and often. Trunk-based development and having every PR that is merged to master be deployed to production in a very short timeframe fits that very well. That's very possible with a solid CI/CD pipeline, good tests, and something that can be deployed often like a web app.

If you don't do continuous delivery, trunk-based development might be a less natural fit.

[ Parent | on HN ]
Re:A note of reflection after 10 years of “A successful Git ... by grovellogic on Thursday March 05, 2020 @04:01PM (#22498199)
You can merge master/develop into your PR multiple times, always keeping it up to date with the latest until until it can be merged.

This is the magic of git, it allows multiple merges something that wasn't possible in older systems.

[ Parent | on HN ]
Re:A note of reflection after 10 years of “A successful Git ... by ivankolev on Thursday March 05, 2020 @04:55PM (#22498767)
That is what I do too. Combined with restriction on the pull request so you can't merge it if it's behind the branch you are merging onto.
[ Parent | on HN ]
Re:A note of reflection after 10 years of “A successful Git ... by geofft on Thursday March 05, 2020 @11:30PM (#22501006)
If you merge your PRs into something that isn't master when they're complete, they're bitrotting anyway, compared to master.
[ Parent | on HN ]