LLM-Driven Merge Conflict Resolution: From Frustration to Automation

PyData St. Louis Merge conflicts are an unavoidable part of collaborative software development, often slowing teams down and creating friction during the development process. Recent advances in Large Language Models (LLMs) have opened new possibilities for understanding code context and assisting developers in resolving conflicts more efficiently. In this talk, Advitya Gemawat, ML Engineer at Microsoft, will explore how LLMs can be applied to merge conflict resolution, the challenges involved in understanding code changes across branches, and the opportunities for building intelligent developer tools. Drawing from his experience building machine learning and AI systems at Microsoft, Advitya will discuss practical approaches, current limitations, and the future of AI-assisted software engineering. Whether you're a software engineer, data scientist, researcher, or AI enthusiast, this session will provide valuable insights into how modern AI is transforming the developer experience. **Schedule** * 6:00 PM – Welcome and introductions * 6:15 PM – Talk and Q&A: *LLM-Driven Merge Conflict Resolution: From Frustration to Automation* * 7:00 PM – Event concludes This is a virtual event. A meeting link will be shared with registered attendees.