Push, Pull, and Approve Process

From PHENOM Portal Knowledgebase
Revision as of 13:38, 8 September 2022 by Nathalie (talk | contribs) (Created page with "== Viewing Your Working Branch == When you want to move from your own version of the model to view or edit another team member's or project team's model or vice versa, you will need to change branches. To view the branch you are currently working in: # Login to PHENOM # When you login, note in your Dashboard that you are working on a particular branch '''INCUDE IMAGE''' {{Info | 1=This branch inherits from a larger project branch that the rest of your team also inherit...")
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search

Viewing Your Working Branch

When you want to move from your own version of the model to view or edit another team member's or project team's model or vice versa, you will need to change branches. To view the branch you are currently working in:

  1. Login to PHENOM
  2. When you login, note in your Dashboard that you are working on a particular branch

INCUDE IMAGE

Navigating to Manage Models > Projects

  1. Login to PHENOM
  2. In the Left Navigation bar, click MANAGE MODELS

Switching branches

To switch between branches:

  1. Select the project you want to update in the Projects list
  2. In the project's details panel, elect the Switch Branch icon from the Branch ribbon next to the relevant model
  3. Select a branch from the drop-down list of available branches
  4. Click the "Switch" button

INCUDE IMAGE

Managing Branch Properties & Permissions

To manage branch properties, select the branch you want to update in the Models list. It will open the branch's details panel on the right and you will be able to rename the branch, manage users' permissions to the branch, or delete the branch.

INCUDE IMAGES

Pulling Changes from the Parent

Pulling allows you to get changes from the branch you have inherited from. These changes can either be accepted or ignored.

To pull from your parent branch open the tab shown below


Here you will be prompted to select nodes from the tree on the left. You may choose to ignore certain changes and accept others. Any changes accepted will overwrite your current version of those model elements.

The pull may fail and tell you that you are missing certain model elements. These could be something such as trying to merge and attribute of an entity without including the entity itself, or a Service but not the view that it points to, etc.

Pushing Changes to the Parent

To push your changes to your parent branch, open the tab shown below


You may select any changes made in the tree on the left, then press the "request push" button. This will not result in a change to your parent branch yet, as these changes must be approved by someone with the correct permissions on your parent branch.

Approving Changes from a Child

To approve changes that have been requested from one of your children branches, open the tab shown below


This tab shows any push requests that have been made by any of your child branches. On selection of one of these options, you may select which of the requested changes you would like to make to your model by selecting them in the tree on the left, then hitting the "Approve" button.

The pull may fail and tell you that you are missing certain model elements. These could be something such as trying to merge and attribute of an entity without including the entity itself, or a Service but not the view that it points to, etc.