The state of automatic merge conflict resolution in 2026: a survey, and where GitWand is headed

If you've used GitWand, you know that the headline feature is automatic conflict resolution: a...