How do I distinguish between two pending change lists in perforce?
•
Java
I have several similar pending change lists, based on the top of the code branch and the same workspace in perforce I need to distinguish between them and (eventually) merge them into a change list What is the fastest and easiest way? I'd rather avoid creating a temporary branch
Solution
The latest version of the server supports canceling changes to the workspace of open files and solving the merge problem
So, assuming your server is new enough, you just need to:
>Shelve changes > start with a clean workspace > cancel changes to one of the workspaces > cancel keeping other changes in the same workspace > resolve any resulting merge changes. > Carefully check your differences before submitting to ensure that you have the required changes
The content of this article comes from the network collection of netizens. It is used as a learning reference. The copyright belongs to the original author.
THE END
二维码