IntelliJ IDEA
 
Get IntelliJ IDEA
You are viewing the documentation for an earlier version of IntelliJ IDEA.

Resolve conflicts with Perforce integration

Last modified: 11 February 2024

As described in the section Resolve conflicts, the conflicts might occur in course of team work. Perforce integration makes use of the following commands:

  • Resolve enables you to resolve a conflict to a specific file.

  • Resolve All applies to all files in a changelist that have merge status.