Helix Core is now P4. Product user interfaces will be updated soon. Learn more >>

P4 for Visual Studio Documentation | 2025.1

# Resolve conflicting changes

Conflicts occur when you attempt to integrate a file into an existing codeline or to submit a changelist containing a file that another user has edited and submitted while you had the file checked out. When the conflict occurs, P4 Server schedules the file for resolve. Conflicts must be resolved before you can submit the changelist that contains the conflicting file.

When you attempt to submit a changelist containing a file that must be resolved, a P4 Server Command Error is returned: `Merges still pending—​use 'resolve' to merge files.` When you return to the Solution Explorer, you will see a red question-mark badge next to the file icon in Solution Explorer : (You may need to right-click the file icon and select Refresh to see the question-mark badge).

If there is a yellow triangle badge on any file, get the latest revision of that file by right-clicking it and selecting Revisions > Get Latest Revision. This will not overwrite the copy of the file that is in your workspace. After you have the latest revision, you can resolve the file. You can resolve files individually or attempt to resolve multiple files at once.

In the P4 for Visual Studio Resolve dialog, Target is the file in your workspace and Source is the file in the depot.

Your search for returned results