Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2016-12-05 21:14:27 +0000
committerdonald.g.dunne2016-12-05 21:14:27 +0000
commitc75dc17b186a3e9f540125ef9a3c6090bfbd386e (patch)
tree65590c441207136ee2428cd28ad53fda724f168b /plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Concepts/Branches.html
parent70c7e8004f96d56b3e27f47eb17939aa3d54c47c (diff)
downloadorg.eclipse.osee-c75dc17b186a3e9f540125ef9a3c6090bfbd386e.tar.gz
org.eclipse.osee-c75dc17b186a3e9f540125ef9a3c6090bfbd386e.tar.xz
org.eclipse.osee-c75dc17b186a3e9f540125ef9a3c6090bfbd386e.zip
feature[ats_ATS325914]: Remove entryGuid from OSEE Types grammar
Diffstat (limited to 'plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Concepts/Branches.html')
-rw-r--r--plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Concepts/Branches.html68
1 files changed, 68 insertions, 0 deletions
diff --git a/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Concepts/Branches.html b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Concepts/Branches.html
new file mode 100644
index 00000000000..eefa91f6eb4
--- /dev/null
+++ b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Concepts/Branches.html
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>Concepts - Branches</title>
+ <link type="text/css" rel="stylesheet" href="../../../book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Branches</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Relations.html" title="Relations">
+ <img alt="Previous" border="0" src="../../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="BLAM.html" title="BLAM">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Relations</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">BLAM</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Branches">Branches</h1>
+ <p>A fundamental feature provided by OSEE is the concurrent management of multiple variants or lines of a product. After a set of requirements is developed, it may become the baseline for variant sets of requirements for similar products. In other words, you may develop the same product for another customer, but have slight changes to the requirements, code, and test for features specific to that customer. </p>
+ <p>Historically, this would mean maintaining completely separate "copies" of all the requirements and other artifacts. This is costly to maintain when changes from the baseline artifacts must be propagated to the other product line. The expense of this undertaking increases dramatically as more customers are added, each with their own set of requirements changes.</p>
+ <p>For this reason, OSEE provides full
+ <b>branching</b> functionality. Using OSEE, it is possible to create these variant branches, record where they originated, and to apply changes made to a baseline branch to its variants.
+ </p>
+ <p>By default, OSEE has two system branches. The <tt>System Root Branch</tt> is the parent of all other branches in the system. The <tt>Common</tt> branch is used to store OSEE configuration information, such as users. <tt>Common</tt> is a child of <tt>System Root Branch</tt>.</p>
+ <h2 id="Working_Branches">Working Branches</h2>
+ <p>On complex projects, artifacts can be subject to modification by any one of hundreds of engineers. To have requirements "locked" while they are being modified by one user can cause significant delays in schedule. The need for parallel development (multiple users working on the same requirements) is a necessity to keeping a project moving forward. In addition, users making mistakes need the ability to revert or throw away their changes and start over without polluting the baseline branch. This is done using
+ <b>working branches</b>. A working branch is a sandbox area used to prepare a commit to a baseline branch.
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="Relations.html" title="Relations">
+ <img alt="Previous" border="0" src="../../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="Concepts.html" title="Concepts">
+ <img alt="Concepts" border="0" src="../../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="BLAM.html" title="BLAM">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">Relations</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">BLAM</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file

Back to the top