lscm conflicts
Hi,
I deleted a file in my workspace, while other user edited this file and delivered it to the stream.
My workspace has conflict. The files was checked in by checking in it's folder, but after Accept action, I can't resolve the conflict because the file doesn't exist and I can't give the command: lscm resolve -c <file>
I saw that there is possibility to resolve with the component, but I need example to understand how to run the command.
* I don't want to resolve the conflict from eclipse client because it's a script.
Need your help,
Yehiel
I deleted a file in my workspace, while other user edited this file and delivered it to the stream.
My workspace has conflict. The files was checked in by checking in it's folder, but after Accept action, I can't resolve the conflict because the file doesn't exist and I can't give the command: lscm resolve -c <file>
I saw that there is possibility to resolve with the component, but I need example to understand how to run the command.
* I don't want to resolve the conflict from eclipse client because it's a script.
Need your help,
Yehiel
2 answers
Hi,
'lscm resolve' command accepts UUID of the file also. One of the ways to determine the UUID is to run 'lscm -u y status -C -v -w -I", which would display the file along with its UUID. UUID of the file can be extracted by parsing the output of the status command in the script.
Thanks,
Sridevi
'lscm resolve' command accepts UUID of the file also. One of the ways to determine the UUID is to run 'lscm -u y status -C -v -w -I", which would display the file along with its UUID. UUID of the file can be extracted by parsing the output of the status command in the script.
Thanks,
Sridevi
