2 ms·

Have you tried this? It would be a nightmare. The LLM wold "solve" the merge conflict by eliminating the code.

• qsera 7mo ago
  But that should make the builds or some tests to fail no? I think we can consider it as a first approximation and proceed to a manual review. It should be a lot easier than manually resolving the difficult merge..
  • adastra22 7mo ago
    That’s solved by disabling or removing those tests. I have tried this. It does’t work.