Resolve git merge conflicts using AI-assisted analysis to choose ours, theirs, both, or a custom resolution