I think that actual direct knowledge about how git merges things and what ends up surfacing as "conflicts" as a result of that is not particularly well understood by quite a large number of people who in practice do not have any trouble using git every day. Moreover, there's nothing specific to git in terms of reviewing code, which is fundamentally what you get from the result of fixing conflicts; once the conflicts are all resolved, there's a diff from the old state (pre-merge) to the new state, and you already should be reviewing it to see if it's what you want even if there were never any conflicts.

LLMs solves them great. So who cares? At most it will ask for a few guidelines on what takes priority, but no one is using git directly anymore.

I have not run a single git command in like the entire 2026.

Nothing.

Should you resolve the conflicts in a bad way we're going to see the result in the MR, will we not?

I don't think git knowledge is essential anymore.

Back in the days of the crappy git GUIs this was a problem, because people would regularly misunderstand even the basics of what they were doing and managed to lose their local changes.

That shouldn't happen with LLMs.

Yeah, I feel like knowing how to use tools is one of the key smells for finding good engineers.

just ask the agent "no mistakes" /s