Hacker News new | past | comments | ask | show | jobs | submit | from login
Mergiraf: a syntax-aware merge driver for Git (mergiraf.org)
432 points by p4bl0 5 months ago | past | 87 comments
Mergiraf – a merge driver for Git that can solve a wide range of merge conflicts (mergiraf.org)
2 points by sandebert 6 months ago | past

Consider applying for YC's Summer 2025 batch! Applications are open till May 13

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

Search: