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