Situation
When editing process flows or data model diagrams, we sometimes get merge conflicts on the location of process flow actions and tables in the diagram.
If for example, in branch A I move process action Z a bit to the left and in branch B a collogue moves branch B a bit to the right, this results in a merge conflict.
Solution
Since this is merely an aesthetic change I do not want to be bothered by it when trying to merge my branch. When you rearrange an entire process flow these conflicts can stack up and confuse (junior) developers. So I think it should be possible to either
- Don’t take this conflicts into account when creating a merge session
- Add a setting so I can configure the SF to not takes these conflicts into account.