A proof-of-concept tool that uses OpenAI's GPT-4 to help you analyze and resolve merge conflicts. It's a work in progress, so please report any issues you find.
Requires GPT-4 access. If no access is available, run export OPENAI_ENGINE=gpt-3.5-turbo.