Hi,
I’ve been having trouble with large USS files (or even any small changes in the wrong place, in smaller files) and merging/resolving those, using Perforce.
It seems the built-in Perforce auto-resolve often doesn’t flag conflicts/issues when automatically merging and marks files as resolved, where in reality it often deletes big chunks of the file/mangles some classes.
Has anyone had a similar experience and does anyone have any advice/ideas/guidance?
Thanks
Set these files as non-mergable (binary) on the server or force a lock on these files when checked out (meaning: only one user is allowed to edit).
When working with Perforce we always flagged XML documents as non-mergable because effectively they often cannot be merged without making the file invalid.
You can run into such issues with any structured text format, including code obviously, but its quite common for merges of text file formats like XML, HTML, YAML, JSON to be invalid after a merge if you do not scrutinize these merges with two eyeballs.