2 ms·BTW not sure how you feel about LLMs but merge conflicts are not really an issue with them any more.by sunshowers 2mo agoBTW not sure how you feel about LLMs but merge conflicts are not really an issue with them any more.