Merging database diagram conflicts

Related products: Software Factory

Facing several times a merging conflict due to slightly changed data model diagrams that some table is moved to different position.

Like when in existing data model diagram in trunk a table is moved to different position and same happened in a branch version also, but then to different position.

Can this be avoided that it comes as conflict?

Hi HJ,

Thanks for submitting this idea. 
I imagine that automatically resolving table positioning conflicts can mess up a diagram’s layout quite a bit (which side wins, especially if both are adjusted?), but let's see how many people agree with you .


Updated idea status NewOpen

Maybe when within certain range, it can be ignored as conflict, only when say delta > 50 to be seen as conflict as then more risk in overlap of tables in the diagram?


Unfortunately, this idea has not received enough votes. Because we want to keep the focus on ideas that are in high demand in our Community, we are closing this idea.


Updated idea status OpenClosed