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

In git, you could do this with a custom merge driver: https://github.com/Praqma/git-merge-driver

No need to put that sort of thing in core.




Join us for AI Startup School this June 16-17 in San Francisco!

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

Search: