Hacker News
new
past
comments
ask
show
jobs
points
by
legorobot
2 hours ago
|
comments
by
sheept
1 hours ago
|
[-]
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.
reply