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

Depending on the format of your files, entries like "changelog merge=union" in your .gitattributes file might work for you.


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

Search: