So far I have not let AI work with git, because I preferred handling version control myself.

Does it work well for resolving merge conflicts in your experience?

In my experience, yes. It has done a great job of choosing which changes should be integrated based on context in the repo, too.

Not the person you responded too, but in my experience the answer is a big yes.

I'm sure that will go well for my formal model in a language that about 100 people use...

If only 100 people in the world are using this language, who are you even merging code with, lol.

Some of the other people?