Would you like to copy the permanent link to your clipboard?
Permanent link:
https://jazz.net/forum/questions/224622/how-to-deliver-or-accept-with-conflicting-changes-incoming-and-outgoing-in-a-stream/224629