A Gemini-powered merge conflict auto-resolution tool which eliminates the tedious process of manual conflict resolution by analyzing conflicting code snippets and generating intelligent resolutions.
-
Clone the project locally and install all the dependencies using
npm install -
Create a .env file in the root folder and the gemini api key obtained from https://aistudio.google.com/app/apikey as
API_KEY=<api_key>inside of it. -
Run the extension by pressing F5.
Project demo at - https://youtu.be/G1XF5Hik5CY