lscm conflicts
Yehiel Glass (255●4●89●86)
| asked Dec 15 '11, 11:44 a.m.
retagged Jun 04 '12, 10:10 a.m. by Evan Hughes (2.4k●13●18)
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 |
2 answers
|
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.