3 ms·
Well, basically, in the case of prose in version control, you don't want automatic merges for anything more than simple grammar or punctuation. Other than that,
by rcthompson 15y ago
Well, basically, in the case of prose in version control, you don't want automatic merges for anything more than simple grammar or punctuation. Other than that, there's not really that much different.