Re:Using Git's rerere feature to escape recurring conflict hell
by lelandfe on Tuesday June 02, 2026 @07:59AM
(#48369086)
I felt similarly. But I'm also usually the only person Tim Pope'ing my commits.
If you police atomic feature branch PRs instead of atomic feature branch commits, though, things actually work out OK.
(By the way, the even more compelling next step to your argument is: pull requests aren't artifacts! I've worked on projects that have emigrated from GitHub, and was left with just the commit log)
If you police atomic feature branch PRs instead of atomic feature branch commits, though, things actually work out OK.
(By the way, the even more compelling next step to your argument is: pull requests aren't artifacts! I've worked on projects that have emigrated from GitHub, and was left with just the commit log)