Currently when a merge conflict occurs between on a flow the developers gets to make a choice, where the granularity of this choice is on flow level. So pick one version of the flow and make the changes that are discarded again on the same flow, which is pretty weird, because what if I wanted both changes? It would increase the speed at which flows are developed and deployed, because developers would not have to do the same work twice.
I propose that there needs to be a way to get a choice on a much lower level than flow level and get to pick the changes which are actually colliding and perhaps even change it manually if neither solution suffices.
This would have to be implemented into OO Studio/Designer itself.