Aqua
 
2024.3
Shortcuts: Windows
Get Aqua
  1. AI Assistant
  2. Get AI assistance for VCS integration

Get AI assistance for VCS integration

Last modified: 27 January 2025

This functionality relies on the AI Assistant plugin that requires an additional license.

For more information about licensing and enabling AI Assistant, refer to JetBrains AI Service licensing and Enable AI Assistant plugin.

Generate commit messages

AI Assistant can send your diffs to the LLM (Large Language Model), which will generate a commit message describing your changes.

  1. Press Alt00 to open the Commit tool window.

  2. Click Generate Commit Message with AI Assistant.

    Aqua: AI Assistant generates commit messages

  3. Edit the message if necessary.

    Aqua: AI-generated commit message

Customize the commit message generation prompt

  1. Press CtrlAlt0S to open settings and then select Tools | AI Assistant | Prompt Library.

  2. In the Built-In Actions section, select Commit Message Generation.

    The list of default rules for commit message generation prompt

  3. In the editor field on the right, specify the rules for commit message generation, like the required number of characters or a different language.

  4. Click Apply.

Edit and improve commit messages

When you have already committed your changes, you can still edit your commit message. Use AI Assistant to help you analyze and better describe the committed changes.

  1. Click in the bottom-left corner or press Alt09 to open the version control tool window.

  2. In the commits pane, right-click the commit you want to update and select Edit Commit Message in the context menu.

    Context menu of the selected commit

  3. In the dialog that opens, click Improve Commit Message with AI Assistant.

    Dialog with an old commit message and the AI Assistant icon

    AI Assistant analyzes the committed changes and generates an improved message.

  4. Edit the new message if necessary and click OK to save the changes.

  5. If the commit has already been pushed to the remote repository, press CtrlShift0K to push the updated commit message as well.

Explain commits

AI Assistant can summarize the changes made in one or several commits.

note

This option is only available if you are using Git or Mercurial for version control.

  1. Click in the bottom-left corner or press Alt09 to open the version control tool window.

  2. In the commits pane, select the commit or several commits you want to summarize, right-click them and select Explain Commit with AI Assistant in the context menu.

    Explain Commit with AI Assistant option in VCS log

    AI Assistant provides the summary of the selected commits.

    AI Assistant explains commit

Generate title and description for pull and merge requests

AI Assistant can generate titles and descriptions for pull requests and merge requests directly from Aqua.

Resolve Git conflicts with AI

When multiple contributors are working with the same part of the codebase, you may encounter overlapping changes that cannot be merged automatically.

Aqua has a tool to resolve any such conflicts, and AI Assistant can help you by automatically merging conflicting changes.

  1. In the Merge Revisions dialog, click Merge with AI.

    Aqua: The Merge with AI option in the Merge Revisions dialog

    AI Assistant then merges both non-conflicting and conflicting changes.

  2. Review the merged result in the central pane of the dialog, edit if necessary, and click Apply.

    Revert changes in the modified lines by clicking Revert.

For more information about merging conflicting changes, refer to Resolve Git conflicts.

Generate shelf title

When you silently shelve your changes, the new shelf gets the default Changes name. With a lot of shelves, it can become confusing to find the necessary changes.

Instead of manually renaming each shelf, use AI Assistant to automatically generate a title for the silently shelved changelist.

  1. Press Alt00 to open the Commit tool window.

  2. Select the file or changelist you want to shelve and click Shelve silently Shelve Silently on the toolbar or press CtrlShift0H.

    AI Assistant will automatically generate the shelf name for the shelved changes.

To switch off this feature, press CtrlAlt0S to open the settings, go to Tools | AI Assistant, and clear the Generates title for shelved change list checkbox.