Merge a Blueprint

The Merge function is used to merge a blueprint from one branch to another (including merging from a branch in the local repo to the same branch in the remote repo).

To merge a blueprint:

1. Click on the tab in the editor pane to open the Snapshot tab.

2. Click Blueprints:

   

3. Click Merge. Some new options are then displayed in the Actions column of the form:

   

4. Click on the button and select the target branch into which you want to merge the blueprint. You can merge into the current branch - all you are doing then is merging the changes into the remote repository. (This is called a "push" operation in git.)

5. Check Delete blueprint if you have finished with the blueprint you are working on: it will then be deleted once the merge has been carried out (as long as it isn't being used by a site publication).

6. Click Merge to proceed with the merge operation, or Close to cancel.

Occasionally, git may be unable to merge the selected branches automatically, due to conflicting changes in the two branches. If this happens, you will need to manually merge the branches using git, and resolve the conflicts. Exactly how you do this is outside the scope of this manual.