Upgrade to add your own logo

How to resolve conflicts with the Perforce diff tool

**Internal only**

Learn how to resolve a check-in conflict using the Perforce diff tool.
Vidyard uses cookies to better understand how videos are viewed, and to improve your experience. Learn more