Y
Hacker News
new
|
ask
|
show
|
jobs
by
fweimer
85 days ago
It allows review of the way the merge conflict has been resolved (assuming those changes a tracked and presented in a useful way). This can be quite helpful when backporting select fixes to older branches.