Y
Hacker News
new
|
ask
|
show
|
jobs
by
sheept
10 days 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.