Also, AI can do that well now too. I haven’t had to deal with merge conflicts for months.

If you're on the repos git page, it's a total of three clicks. It doesn't really require prior knowledge.