Would you like to copy the permanent link to your clipboard?
Permanent link:
https://jazz.net/forum/questions/135664/how-to-resolve-a-conflict-using-lscm/135677