3 ms·
I advocate for lots of short-lived branches, and use something like Git's Pull-Request process to do peer-review. He knocks GitFlow which is something else enti
by mattwad 5y ago
I advocate for lots of short-lived branches, and use something like Git's Pull-Request process to do peer-review. He knocks GitFlow which is something else entirely IMO where you have long-lived branches that never get deleted. If you're doing trunk-based development how does code ever get reviewed first? or it just doesn't?
- sparker72678 5y agoThe pull request flow is fantastic, especially if you have a tool like GitHub’s “Ready to Merge” that shows you if the code can be merged in without conflict. This puts the burden of branch maintenance/compatibility on the branch owner, and allows a clean and clear place for code review.
- sharken 5y agoPull Requests are great, but i think they can be a serious problem if you have to merge between multiple release branches, with testing and approval for each release branch. Using Trunk-based development with feature flags seems to be me to be the best way of ensuring success with a Pull Request model.