4 ms·
But solving merge conflicts is fundamentally an editing task, not source control.
by friendzis 2y ago
But solving merge conflicts is fundamentally an editing task, not source control.
- ninetyninenine 2y agoYeah this is true. It’s similar enough such that most gui version control interfaces include an interface to deal with this.
- aragilar 2y agoYour editor should be able to handle this (via git mergetool).
- BobaFloutist 2y agoWord processors are for editing documents, saving documents in different locations and formats should be handled by your file system of choice.