News for hackers. Stuff that matters.

A comment on GitHub Stacked PRs. Parent comment

Re:GitHub Stacked PRs by krick on Tuesday April 14, 2026 @08:16AM (#47764623)
Not sure if it's true. I mean, I do agree with the core of it, but how do you even do PRs and resolve conflicts, if there are no branches and a developer cannot efficiently update his code against the last (remote) version of master branch?
[ Parent | on HN ]
Re:GitHub Stacked PRs by awesome_dude on Wednesday April 15, 2026 @04:58AM (#47776446)
Trunk based development has every developer in the company committing straight to main - no PRs, supposedly no merge conflicts (but reality is that main moves fast and if someone else is working in the same files as someone else, there will be merge conflicts)

A middle ground is small PRs where people are constantly rebasing to the tip of main to keep conflicts to a minimum

[ Parent | on HN ]