diff options
| -rw-r--r-- | plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml b/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml index 32f7f8145bc..0c39834d368 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml +++ b/plugins/org.eclipse.osee.framework.core.datastore/support/SKYNET.VERSIONING.SCHEMA.xml @@ -390,11 +390,12 @@ </Table> <TableDescription referenceTable="OSEE_MERGE"> - <Note purpose="Core table describing merge branches"/> - <Column id="SOURCE_BRANCH_ID" description="" /> - <Column id="DEST_BRANCH_ID" description="" /> - <Column id="MERGE_BRANCH_ID" description="" /> - <Column id="COMMIT_TRANSACTION_ID" description="" /> + <Note purpose="Core table describing merge branches, these entries stay around because it is currently the only way to view merges. + Please refer to http://wiki.eclipse.org/osee/branch for a developer guide on OSEE branches."/> + <Column id="SOURCE_BRANCH_ID" description="branch being committed, 'working branch' " /> + <Column id="DEST_BRANCH_ID" description="branch being committed into, most commonly parent branch of source." /> + <Column id="MERGE_BRANCH_ID" description="self-explanatory" /> + <Column id="COMMIT_TRANSACTION_ID" description="if the merge branch has been already commited" /> </TableDescription> <Table name="OSEE_CONFLICT" schema="OSEE" tablespace="osee_data"> |