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 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 ]