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.