Perforce merge shelved files

Summary The file submit process by allowing shelved changes to be submitted without requiring that they be unshelved first. There are six conditions which can cause the submit to fail: The shelved files must be at the head revision. Out-of-date files cannot be submitted without unshelving. The shelved files must not have pending resolves. Unresolved files cannot be submitted without unshelving. The owner of the changelist must be the current user.

The changelist must not contain non-shelved files. Non-shelved files must be reverted or reopened in a different changelist before the shelf can be submitted. If the current client is a stream client, the files on the shelf must be submitted in this stream. Examples: Successful and Failed Submits Success:. Internal Properties Validation Status. Helix VCS.

Helix Core Apps P4V. How To Contact Support Whether you're looking for self-service resources, product downloads, or how to contact Technical Support, we've got lots of options to get the help you need—fast! Request Support. Local Phone Support Looking for help? Call us to get started. Active 8 years, 1 month ago.

Viewed 23k times. Improve this question. Derek Mahar. Derek Mahar Derek Mahar See Shelving: Pretty Darn Useful! Shelving stores copies of the file on the Perforce server, so it can be used as a quick backup of work in progress, not ready to be committed yet. Add a comment. Active Oldest Votes. From the Perforce documentation : Shelving is the process of temporarily storing work in progress on a Perforce Server without submitting a changelist.

Improve this answer. Derek Mahar SLaks SLaks k gold badges silver badges bronze badges. The Perforce "shelve" command sounds similar in purpose to git stash , but where Git stores a stash in the local workspace as it does with every change , Perforce "shelve" stores the changes in the depot. I believe that git stash also automatically reverts or in Git terms, resets files in the workspace, where Perforce gives you the option to revert the files.

Sign up or log in Sign up using Google. Sign up using Facebook. Sign up using Email and Password. Post as a guest Name. Email Required, but never shown. The Overflow Blog. Podcast Making Agile work for data science.

Stack Gives Back Featured on Meta. New post summary designs on greatest hits now, everywhere else eventually.