Resolve merge conflict

Let AI Assistant help you resolve merge conflicts.

2024-11-28

While IntelliJ IDEA already has great tools to resolve merge conflicts, AI Assistant makes it even easier. Click the AI Assistant icon to have AI Assistant resolve your merge conflicts for you.

Related Resources

Explain Spring Data QL fragment

Let AI Assistant explain a Spring Data QL fragment.

Inline Completion Shortcut

Choose which key to use for inline AI completion.

Discover Features

Discover AI Assistant Features right inside the IDE.