Yeah this seems silly. You can do the same thing in git (add and commit with the... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

ericpauley 5 months ago | parent | context | favorite | on: The future of version control

Yeah this seems silly. You can do the same thing in git (add and commit with the conflict still there)! Why you would want to is a real mystery.

fweimer 5 months 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.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact