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 synchronised 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.
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) Either From the My Tasks dashboard, press the Or From the Edit Task view, press the If the rebase comparison shows that merging can be completed with no content conflicts, the main display panel changes to show a green Once the merges are completed, the main display panel changes to show a green a green If the merge comparison detects conflicting changes in the task branch and the project branch content, then the Concept Merges screen is presented after the comparison screen. 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). Pick one of the three versions by pressing the small purple Accept This Version box in its concept version header action icons menu. A Saving accepted merge concept header notification is presented. On merge completion a Merge accepted for concept <SCTID> header notification is presented, the Conflict Resolution display panel is cleared, and the concept FSN is removed from the Merges To Review list, and added to the Merges Accepted list in the context tab navigation panel. 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. The Task View is reloaded, with the LH menu panel Any concepts loaded into the edit panel which were updated during the merge process will now show the newly merged version of their content.Steps References 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.Rebase this task from project icon button in a task row.Pull new changes from project icon button in the LH action button panel.The main display panel changes to show a blue Comparing task to project, please wait a moment... notification screen (with a visual timer indication that the comparison process is taking place).Task and project can be merged without issues, pulling changes in from project... notification screen (with a visual timer indication that the merge process is taking place).Success! Switching to task view in five seconds... notification screen, which closes automatically after five seconds have elapsed (during which the merges are finalised in the task branch content).In the Merges To Review tab Press the pencil icon button to the right of a concept FSN in the concepts list. A 3-panel view is presented in the Conflict Resolution display panel, showing the Project Version to the left, the Task Version to the right, and between them a Merged Version of the concept to review. 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. 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, which closes automatically after five seconds have elapsed (during which the merges are finalised in the task branch content).Pull new changes from project (rebase task) button now disabled (greyed out).