I’ve been experimenting with o1-mini for resolving Git conflicts, and while the results have been mixed, I still find them quite promising! It’s likely that my approach isn’t fully optimized yet, but I suppose that’s part of the journey. 
From this experimentation, I’ve developed a working solution that features a specialized GUI and can be easily configured to integrate with existing Git clients. It is open-source, and I think it could be (or at least may become) a helpful tool for anyone dealing with the sometimes frustrating world of conflict resolution.
For those who are curious, I’ve put together a detailed explanation of the approach and the tool itself here:
I’d love to hear your thoughts and feedback, especially if you decide to try it out!