Would you like to copy the permanent link to your clipboard?
Permanent link:
https://jazz.net/forum/questions/5489/problem-merging-and-resolving-conflicts-after-applying-patch/5491