Merge and conflict resolution is a minefield if unexperienced developers do it t... | Hacker News

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

kzrdude on Nov 22, 2022 | parent | context | favorite | on: Extremely Linear Git History

Merge and conflict resolution is a minefield if unexperienced developers do it too. Fortunately it can (often) be arranged that those with some understanding of the issues involved can do the resolution.

cerved on Nov 22, 2022 | [–]

you get the same, and often more, conflicts using rebase

z3t4 on Nov 23, 2022 | [–]

Always clone to another folder before merging ;)

Consider applying for YC's Fall 2026 batch! Applications are open till July 27.
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact