Welcome to the Jazz Community Forum
DNG - Manual merge for artifact attribute conflicts?

When delivering change sets, there seems to be no manual merge option available for if an attribute (other than primary text) has a conflict.
The only options I can see are to pick either the source or target as the value to keep, or auto-merge (which doesn't work for these since they're string attributes and I need to produce a merged version containing the changes from both the source and target configurations). That implies that post-deliver I'd need to create a new change set to re-implement the change by hand.
Am I missing something?
Thanks.
-John