3 ms·
You can still verify the result of an automatic merge. It's simpler to mark a suggestion "y" than to resolve conflicts that could be solved automatically by han
by gcp 10y ago
You can still verify the result of an automatic merge. It's simpler to mark a suggestion "y" than to resolve conflicts that could be solved automatically by hand.
So I don't think this reasoning holds any ground whatsoever.
- andrewflnr 10y agoYou're not actually contradicting GP. Marking a suggestion "y" is still making a human decision, just with really good auto-complete.
- gcp 10y agoLook into the actual posts, it was used as an argument to dismiss smarter merge algorithms which is of course the smarter auto-complete part.
- andrewflnr 10y agoWhat they're actually objecting to of the idea of not having a human in the loop. I suspect if you pitched these smart merge algorithms from the "click to accept auto merge" angle, they wouldn't have much of a problem. Instead they seem to be pushed as a way of avoiding interaction.
- posterboy 10y ago>that could be solved automatically by hand. looks like you should have had a merge conflict in that sentence /s
- gcp 10y agoAdd a comma before "by hand" and it'll make sense.
- posterboy 10y agoNah, I'm not sure the comma is grammatical, might actually make the last part a contradicting enumeration. The blame is on me, I quoted out of context and was a bit on the slow side understanding. The sentence is just not written well, too. On topic however, missing one such conflict is easier, if you have to spot it after the damage is done, instead of having to think about it yourself beforehand, no?