Push, Pull, and Approve Process

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.