I admit that git is a bit hard. But you need to know only a few basic rules to get merges and rebases right. And git doesn't throw things away, at least for a month. There is enough room for experiments. Can't handle even that? Get help and learn. Giving it to AI instead is a disaster in the making.
How can you resolve a conflict without actually talking to all the parties involved? I have never seen a serious conflict that could be magically solved without knowing what's inside people's head, what was the goal of each commit, and ending with negotiations and/or refactoring. Using LLMs here wouldn't solve anything.