Hacker News
new
past
comments
ask
show
jobs
points
by
ericpauley
3 hours ago
|
comments
by
fweimer
3 hours 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.
reply