You can merge a branch back into its original source (or any "earlier" branch from the same source. For example, let's say you have a topic about "Temperature Sensors" and you branch it into two different topics. You now have the original "Temperature Sensors" topic and a branched version of it. These branches are completely separate, and you now have the choice to:
-
Let the multiple branches exist concurrently in Paligo as separate, but related, publications or topics
-
Merge the branches into a single publication or topic (the result of a merge is called a "single branch")
-
Merge parts of the branches. The branches will still exist concurrently as separate publications or topics, but some of their content will be merged so that it is identical in all versions. You can choose which parts you want to merge and which parts you want to remain separate.
The process for managing merges is slightly different depending on whether you want to Merge a Topic Branch or Merge a Publication Branch.
Note
Merging branches will not affect any mapping you have in place for publishing to other systems, such as Zendesk and Salesforce. To find out how Paligo manages the ids of the content, see What Happens When You Merge a Branch?.
You can use Paligo's merge feature to combine content from two different branched topic versions. This is useful when you have an existing "live" topic and you need to work on some updates separately.
If you move existing content into a new section element and making it a subsection. Paligo will recognize the moved content as deleted content in its original position and the new position as new content.
To merge a branched topic into a "Live" version:
-
Make sure that the "Live" version and the branch are checked in and have the status Work in progress.
-
Select the Dotted menu (...) for the "merge from" branch in Content Manager
-
Select Branching and choose Merge Branch.
-
Select the Merge target from the menu. This can either be the main topic or other topics created from the same branch.
-
Select Next.
-
Paligo provides you with a preview of the changes divided in two columns. Left column shows the Merge target and right column shows the Merge from branch.
Color highlights show the changes:
-
Red - This content will be deleted from the "Merge target" and is grayed out in the "Merge from" column.
-
Green - This content is new or changed that will be added to the "Merge target". It only exists in the "Merge from" branch at the moment.
-
-
Choose what to include or exclude from the merge.
-
Accept the change by leaving it highlighted.
-
Reject the change by selecting the text fragment. It is possible to toggle the change on and off.
-
Do nothing if you only want to view the changes. You can close the window by selecting the X in the top right corner.
-
-
Select the Preview button in the lower right corner to see how the changes affect the content.
-
Select Close to end the preview.
-
Select Merge to complete the merge process.
You can use Paligo's merge feature to combine content from two different branched versions of a publication. This is useful in many different scenarios, but is commonly used when you have an existing "live" publication and you need to work on some updates separately.
In this situation, you publish the "Live" publication and create the "In progress" branch, see Create Branches. This makes it possible to work on updating the "In progress" branch. When the update is ready to be published, you merge it with the "Live" version, to create one up-to-date version and then publish it.
-
Make sure that the "Live" version and the branch are checked in and have the status Work in progress.
-
Select the Dotted menu (...) for the "merge from" branch in Content Manager.
-
Select Branching and choose Merge Branch.
-
Select the Merge target from the menu. This can either be the main publication or other publication created from the same branch.
-
Select Next.
-
Paligo displays a Preview (Simple Merge) of what the "Merge target" will look like after the merge has taken place. Color highlights show the changes:
-
Red - This content will be deleted from the "Merge target".
-
Blue - This content will be updated with content from the "Merge from" branch that is different to the content in the "Merge target".
-
Green - This content will be added to the "Merge target". It only exists in the "Merge from" branch at the moment.
Note
The Preview is the same in both Simple Merge and Advanced Merge. You can toggle between Simple Merge and Advanced Merge with the button in the lower left corner. Depending on which view that is activated, the button name switches between Simple Merge and Advanced Merge.
The advanced merge has three columns:
-
Left column shows the content in the "Merge from" branch in its current state.
-
Middle column shows the content in the "Merge target" branch in its current state.
-
Right column (same as Simple Merge) shows a Preview of the "Merge Target" branch if the merge is done.
-
-
Use the Preview column to control which changes that will be applied to the "Merge target". When you choose which content you want to merge, the preview is instantly updated.
-
Restore a deleted topic by selecting the red topic. It will be marked as "added" (green).
-
Remove an added topic by selecting the Green topic. It will be marked as "deleted" (red).
-
-
Accept topic changes by selecting the Checkmark to the right of the blue topic. The changes will be merged into the "Merge target".
-
Reject topic changes by selecting the Cross to the right of blue topic. The changes will not be merged into the "Merge target".
-
View the topic changes and accept or reject them individually by selecting the Pen to the right of the blue topic . This opens the Merge document dialog that highlights the content changes and makes it possible to choose what to include or exclude from the merge.
-
-
-
Select the Pen to view the changes individually.
Important
If the Publication Topic has been updated, it will be highlighted in blue and the pen will appear to the right of the publication icon.
To merge these changes into the merge target, you have to select the pen and choose merge to accept them. Otherwise these changes will not be seen as accepted for the merge.
-
Choose what to include or exclude from the merge.
-
Accept the change by leaving it highlighted.
-
Reject the change by selecting the text fragment. It is possible to toggle the change on and off.
-
Do nothing if you only want to view the changes. You can close the window by selecting the X in the top right corner.
-
Select the Preview button in the lower right corner to see how the changes affect the content.
-
-
Select Merge to save the changes and return to the Preview (Simple Merge).
-
Select Settings in the top right corner.
-
Use the checkboxes to decide what happens with the branches after the merge is done:
-
Check the "From" branch box to delete the "Merge from" branch.
-
Check the Unchanged inner branches box to delete any reused topics or publications that are identical in the "Merge From" branch and the "Merge To" branch.
-
Clear the boxes if you want to keep the "From" branch and / or the unchanged inner branches.
-
-
Select Merge to complete the merge process.
Comments
0 comments
Article is closed for comments.