| Steps | References |
|---|
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 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. |  Image Added
 Image Added
|
Either From the Dashboard - My Tasks dashboard, press the Rebase this task from project icon button in a 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. |  Image Added
 Image Added  Image Added
|
| A "Task details loaded" header notification is presented, and the The main display panel changes to show a blue "Comparing task to project, please wait just a moment... notification screen " full display panel notice (with a visual an animated timer indication that the comparison process is taking place). |  Image Added
|
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... notification screen " full display panel notice (with a visual 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 green a green "Success! Switching to task view in five seconds... notification screen" full display panel notice, which closes automatically after five seconds have elapsed (during which the merges are finalised in the task branch content). |  Image Added
 Image Added
|
If the merge comparison detects conflicting changes in the task branch and the project branch content, then the Concept Merges screen is presented after 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). |  Image Added
|
| In the Merges To Review tab Press the blue "pencil" icon button to the right of a concept FSN in the concepts list. |  Image Added
|
| The display panel shows a A 3-panel view is presented in the Conflict Resolution display panel, showing 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 to needing review for merge resolution. |  Image Added
|
Pick one of the three versions by pressing the small purple Accept This Version box icon button in its concept version header action icons menu. A "Saving accepted merge 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 Conflict Resolution display panel is cleared, and 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. |  Image Added
 Image Added
|
| 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 action button is presented below the list of accepted concepts. |
|
Press Finalize Merges to 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... notification screen" 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 will now show the newly merged version of their content. |
|