remie/CDI — Issue #30: Working with multiple developers in the same environment
Author: brendo
Created: 2011-12-06 11:58:44+00:00
State: open

Hey Remie,

We're in a situation where we have multiple developers working on a single Symphony instance that all have CDI set to be a slave instance. The problem is that as the queries are written to the file (and a single line at that), Git often has conflicts when we merge the database changes around.

@nickdunn pointed me to your [logquery-db](https://github.com/remie/CDI/tree/logquery-db) branch, so just wondering if that's an idea or actually the future moving forward?