Prerequisites
- Diversion installed on the same computer, and you are signed in. See the quickstart. The plugin uses the
dvCLI and your Diversion sign-in. - A Diversion repo cloned to your computer, or clone one from the IDE (see below).
Install the plugin
- In the IDE, open Settings → Plugins → Marketplace.
- Search for Diversion and click Install. Restart the IDE if it asks.
Open a repo
- A repo you already cloned: open its folder as a project. The plugin finds the repo by its
.diversionfolder. - Clone from the IDE: open File → Open → Get from Version Control in Rider, or File → New → Project from Version Control in IntelliJ IDEA and most other JetBrains IDEs. In the Clone Repository dialog, set Version control to Diversion, pick a repo from Repository, choose a Directory, and click Clone. If your repo isn’t in the list, type its name.
dv login, then reopen the project.
Work with Diversion in the IDE
Diversion actions are in the Diversion menu in the main menu, and in the Diversion submenu when you right-click a file or folder:- Current Workspace Revision: the repo, branch, and commit your workspace is on.
- Commit: commit your changes.
- Reset: discard your changes to the selected files.
- Branches: see branches and check one out.
- Resolve Merge Conflicts: open merges that have conflicts. It’s greyed out until the repo has an open merge. When it does, the IDE also shows Your repository contains open merges.
- Update Workspace: bring your workspace up to date with the latest commit on your branch.
- File Actions: Workspace Changes, Compare with base branch, Compare with Branch…, and File History.
- Browse in Diversion Web App: open the repo in the web app.
See who changed each line
To see who last changed each line of a file, right-click the line numbers in the editor and choose Annotate. Each line shows its author and date. Hover over an annotation to see the commit. This requires plugin version 1.4.4 or later.Commit tool window
When the Diversion plugin is active, the IDE uses the Commit dialog instead of the Commit tool window. This applies to the whole project, including Git roots in the same project. Your changes are in the Local Changes tab of the Version Control tool window. To use the Commit tool window instead:- Open Help → Find Action and type
Registry.... - Find
vcs.force.non.modal.commitand turn it on.

