| 112 |
Do NOT touch the last-merge version, except to update its schema before a |
Do NOT touch the last-merge version, except to update its schema before a |
| 113 |
merge. |
merge. |
| 114 |
|
|
| 115 |
Enable revisions on ALL content types, and install the Diff module. It |
Enable revisions on ALL content types, and install the 'Diff' module. It |
| 116 |
helps tremendously in conflict resolution (such as if the same node was |
helps tremendously in conflict resolution (such as if the same node was |
| 117 |
edited in both development and production). |
edited in both development and production). |
| 118 |
|
|
| 119 |
|
Use the 'Mode' module to create development, production and read-only |
| 120 |
|
sets of permissions. Enable the "read only" mode when merging. |
| 121 |
|
|
| 122 |
|
|
| 123 |
MERGING DATABASES |
MERGING DATABASES |