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

But solving merge conflicts is fundamentally an editing task, not source control.


Word processors are for editing documents, saving documents in different locations and formats should be handled by your file system of choice.


Yeah this is true. It’s similar enough such that most gui version control interfaces include an interface to deal with this.


Your editor should be able to handle this (via git mergetool).




Consider applying for YC's Summer 2026 batch! Applications are open till May 4

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

Search: