PhpStorm enables you to examine the differences between two revisions of a file, or between the current local copy and any repository version. Differences display in the Differences viewer. This window enables you to compare files and versions, navigate and search through the changes, copy and edit source code. Use the legend of the viewer to recognize modified, deleted and added lines of 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.