This solution is neat, but Git also has a very simple built in solution: https:/... | Hacker News

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

lozenge on July 3, 2018 | parent | context | favorite | on: How we solved GitLab's changelog conflict crisis

This solution is neat, but Git also has a very simple built in solution: https://git-scm.com/docs/gitattributes#gitattributes-union

nettsundere on July 4, 2018 [–]

union is bad in general, there is a risk of bad merge

nettsundere on July 4, 2018 | [–]

works pretty well until you really need to have similar lines from each branch

Consider applying for YC's Winter 2027 batch! Applications are open till November 2.
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact