Page History

When task content becomes diverged from its parent project,

the task becomes eligible for rebasing from the project, to

synchronise

synchronize its content with the parent branch changes since the task was created.

Info

title	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.

Excerpt

keep it synchronized with changes made to its parent project since the task was created. Prerequisites: Create a new task or Create a new concept or Create a new concept based on a template or Create a batch of concepts based on a template or Edit a published concept

A task becomes diverged from its project when the project content gets updated after content has been modified within the task. This may happen through other tasks being promoted to the project, and also through project rebase from its mainline.

A task may also fall behind its parent branch, when the parent content changes before any changes are made to content within the task. This may happen when a task is created but no changes are made within it or some time whilst other changes occur in project content for instance via a subsequent project level rebase, and/or another task being promoted to the project.

When either of these situations occur

Advanced Tables - Table Plus

class	user-guide-steps-references

Steps

References

Note

title	Diverged tasks cannot be promoted

Task promotion is not possible whilst a task is diverged, so periodic rebasing is an important aspect of project and task management - ideally as soon as possible following divergence (fewer differences make for simpler content merges).

Attempting to promote a task which is diverged (indicated by an active rebase action button for that task) will trigger a Promote Task pop-up notification that the task and project are not synchronized. The only available action on that notification is to return to the task - the promotion request is blocked.

Image Added

Excerpt

Advanced Tables - Table Plus

class	user-guide-steps-references

Task rebase eligibility

This is required before the task can be promoted to the project. In this situation, the divergence

is indicated in two places:

in

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

. In an open task, as an active (yellow) `Pull new changes from project` icon button in the LH action button panel of the Edit Task view.	Image Modified Image Modified
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.	Image Modified Image Modified Image Modified
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).	Image Modified
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

finalized in the task branch content).

Info

title	Silent merging

Although this sequence indicates content can be automatically merged without user intervention, any differences are still saved in the task branch to bring it back in synchronization with the project content.

This path simply means that none of the content changes in the project since the task was first created are in conflict with the changes made in the task since then.

All subsequent concept changes at the project level that were not directly related to the concepts being changed within the task become available within the task after rebasing.

Silent merging also occurs for changes within a concept being modified within the task if the changes do not conflict - for instance new descriptions may be added that were brought into the project concept version from another task or from the project's mainline.

Image Modified

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).

Image Modified

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

Image Modified

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.

Image Modified

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!).

.

An "Accepting merged version for concept <SCTID>" header notification is presented.

Info

title	Saving a merged concept is usually very rapid

These two stages usually happen quickly, so these header notifications may be very brief!

Image Added

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.

Image Removed

Repeat the concept merge resolution steps for every concept in the Merges To Review list, until

that

the list is empty.

When the Merges To Review list is empty

Image Added

On accepting the final concept merge, the context tab navigation switches to the Merges Accepted list, and a Finalize Merges action button is presented below the list of accepted concepts. At this stage the Merges To Review list is empty (although still available as a context panel tab).

Image Added

Press Finalize Merges to complete the rebase concept merges process and persist the changes in the task branch content.

An "Applying merged changes..." header notification is presented whilst all the accepted merge changes are

applied

saved to the task branch

concepts

content.

Image Added

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).

Image Added

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.

The Dashboard - My Tasks view REBASE column icon for this task will also now be inactive.

At this point the task branch status has been returned to Forward, and changes made within the task are once again eligible for promotion to the project.

Image Added

Page tree

Versions Compared

Old Version 4

New Version Current

Key