u/genuinenewb

Currently I use Kdiff3 to resolve conflicts.

However, there are times where Kdiff3 incorrectly auto resolve merge conflicts incorrectly. As a result, I have to look through all changes and verify them.

Is there an AI tool that is smart at resolving conflicts or where you can tell it what you prefer to happen, even if the algo/date/time of the commits don't make sense?

From time to time, my presets settings would be reset to default settings.

Does anyone have the same issue and know how to solve this?

I am guessing this could be due to software updates.

Would disabling auto save settings when logging out help?

How about unchecking importing settings when logging in?