AI support for merge conflict resolution

[thibaut-pro]

Is your feature request related to a problem? Please describe. Merge conflicts are something that give developers hours of headaches.

Describe the solution you'd like Use a fine tuned model similar to https://www.reddit.com/r/MachineLearning/comments/1795yej/p_mergellama7b_a_fine_tune_of_codellama_for/ to automatically resolve merge conflicts.

[Amatewasu]

It would be so great!

[anasfanani]

Yeah, it would be great for everyone, I'm headache trying to resolve 63 conflicts.

[Ben-Mack]

+1 Just want to say this feature gonna be especially helpful when you have to maintain a custom fork of big lib.