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.

[git-hamza]

any update on this one?

[daniel-bonaker-qestit]

My merge conflicts are moderate - still i'd love to get some help from AI!
This is n°1 on my wish list.

[lucastraba]

+1! I think it's the only thing this great IDE is lacking. I go through the trouble of opening Webstorm just for conflict resolution lol

[johan-gorter]

You can also open the file with merge conflict markers and prompt "keep changes from both versions". Worked like a charm for me!

[AnkMister]

just had the agent start helping me merge and it worked beautifully. extremely helpful. It could see the merge conflict markers and was able to get through them very fast. saved me hours