Page tree

You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 4 Next »

In this page:

How to rebase a task to bring in changes from other tasks which have been promoted within the same project, and also from changes in other projects promoted to MAIN, via rebase of the project. This process keeps tasks synchronized with changes made in other project tasks prior to project promotion, and also (following parent project rebase) with changes made in other projects which have been promoted to MAIN.


StepsReferences

When task content becomes diverged from its parent project, the task becomes eligible for rebasing from the project, to synchronise its content with the parent branch changes since the task was created. This is required before the task can be promoted to the project. In this situation, the divergence is indicated in two places: in the Dashboard - My Tasks entry, as an active (yellow) Rebase this task from project  icon button in its task row, and also within an opened task, as an active (yellow) Pull new changes from project  icon button in the LH action button panel of the Edit Task view.

Either

From Dashboard - My Tasks, press the Rebase this task from project  icon button in the task row REBASE column.

Or

From the Edit Task view, press the Pull new changes from project  icon button in the LH action button panel.

A "Loading task details..." header notification is presented and the main display panel is cleared.

 

A "Task details loaded" header notification is presented, and the main display panel changes to show a blue "Comparing task to project, please wait just a moment..." full display panel notice (with an animated timer indication that the comparison process is taking place).

If the rebase comparison shows that merging can be completed with no content conflicts, the main display panel changes to show a green "Task and project can be merged without issues, pulling changes in from project..." full display panel notice (with an animated timer indication that the merge process is taking place).

Once the merges are completed, the main display panel changes to show a green a green "Success! Switching to task view in five seconds..." full display panel notice, which closes automatically after five seconds have elapsed (during which the merges are finalised in the task branch content).

If the merge comparison detects conflicting changes in the task branch and the project branch content, then the Concept Merges screen appears when the comparison screen closes.

This presents a list of the concepts that need merge conflicts to be reviewed and resolved in a context tab navigation panel to the left, with a Conflict Resolution display panel to the right (initially this will be blank).

In the Merges To Review tab Press the blue "pencil" icon button to the right of a concept FSN in the concepts list. 

The display panel shows a 3-panel Concept Merge Resolution view, with the Project Version to the left, the Task Version to the right, and between them a Merged Version of the concept needing review for merge resolution.

Pick one of the three versions by pressing the small purple Accept This Version  icon button in its concept header action icons menu.

A "Saving accepted merged concept..." header notification is presented and the version being saved is greyed out (usually very briefly!).

On merge completion a "Merge accepted for concept <SCTID>" header notification is presented (where <SCTID> is its SNOMED CT Identifier), the display panel is cleared, the concept FSN is removed from the Merges To Review list, and it is added to the Merges Accepted list in the context tab navigation panel.

Repeat the concept merge resolution steps for every concept in the Merges To Review list, until that list is empty.
When the Merges To Review list is empty, the context tab navigation switches to the Merges Accepted list, and a Finalize Merges action button is presented below the list of accepted concepts.

Press Finalize Merges to complete the rebase concept merges process.

An "Applying merged changes..." header notification is presented whilst changes are applied to the branch concepts.


Once the merges are completed, the main display panel changes to show a green  a green "Success! Resolved merges applied. Switching to task view in five seconds..." full display panel notice, which closes automatically after five seconds have elapsed (during which the merges are finalised in the task branch content).

The Task View is reloaded, with the LH menu panel Pull new changes from project  (rebase task) button now disabled (greyed out).

Any concepts loaded into the edit panel which were updated during the merge process now show the newly merged version of their content.


  • No labels