IntelliJ IDEA allows you to examine the differences between two revisions of a file, or between its current local copy and the repository version. The differences are displayed in the Differences viewer. This window allows you to compare files and versions, navigate and search through the changes, copy and edit the source code.
This section describes how to:
- Compare file versions
- Integrate contents of different versions into a file
- Resolve conflicts between versions
- Integrate your local copy of a project into a revision in the repository