Resolve Conflicts In Upload Center. To resolve a file conflict you determine the contents of the files youintend to submit by issuing the p4 resolvecommand andchoosing the desired method of resolution for each file. To keep the incoming changes click Resolve.
After you resolveconflicts you submit the changelist containing the files. Click it to open the Office Upload Center. The steps below should work for you regardless of which version of MS Office and ESET you are running.
In May 2020 Microsoft replaced the Upload Center with the less intrusive Files Needing Attention feature.
If your last edit to the file in question was on this computer select the top option. To resolve a file conflict you determine the contents of the files youintend to submit by issuing the p4 resolvecommand andchoosing the desired method of resolution for each file. To keep the incoming changes click Resolve. From there you can try uploading again or getting the online revisions to merge.
