Re:Using Git's rerere feature to escape recurring conflict hell
by sheept on Monday June 01, 2026 @12:05PM
(#48358708)
That sounds like a lot of work. If you rebase A on main then B on main, you end up having to resolve A's conflicts on main twice. But if you stick with merge commits, A's conflicts are handled once in the merge from main.
[ Parent
| on HN ]
There are no comments on this comment yet.