JetBrains Rider
 
Get JetBrains Rider
Get your hands on the new features ahead of the release by joining the Early Access Program for Rider 2025.1! Learn more

Resolve conflicts with Perforce integration

Last modified: 21 March 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.