Skip to main content
Jump to: navigation, search

Difference between revisions of "OSEE/branch"

Line 1: Line 1:
 
This wiki describes OSEE branches, conflicts and merge handling. Target audience: developers.  
 
This wiki describes OSEE branches, conflicts and merge handling. Target audience: developers.  
  
To also help in understanding of a sample scenario will be discussed.
+
To also help in understanding of a sample scenario (default Demo database) will be discussed.
 +
 
 +
[[Image:Example.jpg]]
  
 
= Branch =
 
= Branch =

Revision as of 18:21, 31 January 2012

This wiki describes OSEE branches, conflicts and merge handling. Target audience: developers.

To also help in understanding of a sample scenario (default Demo database) will be discussed.

Example.jpg

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 -1 0 1 1 -1 1

Merge(s)

Conflict(s)

Back to the top