Hacker News new | past | comments | ask | show | jobs | submit login

Note that you can specify a custom merge driver for different file types using a combination of gitattributes and git-config: https://git-scm.com/book/en/v2/Customizing-Git-Git-Attribute...



Consider applying for YC's Fall 2025 batch! Applications are open till Aug 4

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

Search: