What is the best way for a team to work on a single graph and resolve conflicts between? I have a team with various different disciplined from developers to designers all wanting to update the same graphs (that control user flow through our app). The json saved in the yml files is done over a few lines with no obvious logic as to the break locations and it means that if 2 users have changed the graph they end up with an incredibly difficult to reconcile merge.
At the moment my best option is to copy both blocks of json to separate files, remove the manual line breaks which turns it into a single line of valid json, then prettify both and perform a diff on those which is extremely time consuming!
There are some things on discussion regarding resolving this on a different thread in the forums right now.
Here is the thread for your convenience in case you would like to chime in 🙂