Skip to main content
Jump to: navigation, search

Difference between revisions of "OSEE/branch"

(Branch)
(Branch)
Line 16: Line 16:
 
|PARENT_TRANSACTION_ID
 
|PARENT_TRANSACTION_ID
 
|-
 
|-
|A
+
|System Root Branch
|B
+
|4
|C
+
|1
|D
+
|AyH_fDnM2RFEhyybolQA
|E
+
|-1
|F
+
|0
|G
+
|1
|H
+
|1
|I
+
|-1
|J
+
|1
 
|-
 
|-
 
|}
 
|}

Revision as of 17:38, 31 January 2012

This wiki describes OSEE branches, conflicts and merge handling. Target audience here is primarily developers.

Branch

A branch in OSEE is represented by an entry in OSEE_BRANCH table.

BRANCH_NAME BRANCH_TYPE BASELINE_TRANSACTION_ID BRANCH_GUID ASSOCIATED_ART_ID ARCHIVED BRANCH_ID BRANCH_STATE PARENT_BRANCH_ID PARENT_TRANSACTION_ID
System Root Branch 4 1 AyH_fDnM2RFEhyybolQA
0 1 1
1

Merge(s)

Conflict(s)

Back to the top