as a regular user of xaml files I have found it very difficult to merge changes because the Workflow Editor does serialize its UI state into the resultuing xaml. This causes many changes in the resulting xaml and merge conflicts if I and my colleague did
expand the same xaml nodes. To concentrate on the relevant things I would like to have all designer properties on a separate line wich I can mark with an advanced merge tool like BeyondCompare as irrelevant.
The ViewState can be filtered out quite easily but I have a hard time to filter out lines which do contain sap:VirtualizedContainerService.HintSize. On these lines the arguments to the activity might have been changed but I cannot flag this change as unimportant
because the merge tools I do know do not let me create intra line filters.
It would help a lot if the ContainerService.HintSize would be on a separate line with no other content. Then I can filter irrelevant changes in a clean way and merges become much easier.