We tested to ensure that conflict resolution appears for * Opus and Draconic * Draconic and Draconic 2 * Draconic 2 + Opus and Draconic 1 |
||
|---|---|---|
| .. | ||
| data | ||
| migrate | ||
| data_schema.rb | ||
| schema.rb | ||
| seeds.rb | ||
We tested to ensure that conflict resolution appears for * Opus and Draconic * Draconic and Draconic 2 * Draconic 2 + Opus and Draconic 1 |
||
|---|---|---|
| .. | ||
| data | ||
| migrate | ||
| data_schema.rb | ||
| schema.rb | ||
| seeds.rb | ||