Yes, this approach can help resolve merge conflicts, but a major issue still remains: while resolving these conflicts, the LLM often removes parts of the program's functionality or unintentionally introduces bugs. If we want to scale this system, we need a mechanism to run test cases from both branches being merged, so we can be confident that no functionality is lost during the merge and that the code remains stable. > On 2 Aug 2025, at 3:08 AM, Skybuck Flying <skybuck2000@xxxxxxxxxxx> wrote: > > The AI/Gemini in general seems good at resolving/manipulating source code bases/files, so it should be able to solve merge conflicts, the question remains how big of a merge conflict it can truely solve before becoming confused and human intervention might be necessary, but by that point it might be too big of a mess for a human as well, so far the AI seems to be doing ok, but to early to tell.
