Merge changes from pending CLNs into open files

I have a deferred CLN with 2 files. I also have a default CLN open in my workspace with two files in it. There is one file between the two CLNs. I am trying to delete my modified CLN changes and was hoping that perforce would be able to merge the changes in a common file. But he just says that the file is already open and it cannot be deleted. The command I use is:

p4 unshelve -s cln -c cln

Is there a way for my complete changes to be merged into my already open file?

+4
source share
1 answer

The ability to delete open files (and allow changes) was added in the 2011.1 release. Can you upgrade your server?

+2
source

All Articles