3 ms·
Auto merge using a “semantic diff” sounds line a complete nightmare to me. How many people actually check that git has merged code correctly? When there are no
by evouga 4y ago
Auto merge using a “semantic diff” sounds line a complete nightmare to me.
How many people actually check that git has merged code correctly? When there are no conflicts and the merge passes CI? Exactly.
Now imagine the git automatically fixes conflicts by rewriting code Copilot-style. It will work perfectly 95% of the time—--so that new feature is too useful to ignore and everyone uses it. 5% of the time git resolves the conflict by riddling your code with subtle bugs and vulnerabilities…