Merging Branches
In a collaboration session, you can merge approved changes or design modifications from an exploratory branch into the current active branch.
Evaluating Merge Conflicts
Before performing a merge, you can check for potential merge conflicts for a specified branch against the merge target branch:
1. In the collaboration history, right-click on the branch you intend to merge.
2. Select Evaluate Merge Conflicts. If there are any conflicts between the changes on the current branch and the conflict evaluation branch, a conflicts icon will appear in the Model Tree.
3. Hover over this icon to preview the conflict error.
4. Resolve the conflict based on the error details, then proceed with the merge.
To disable the conflicts preview:
1. Right-click on the branch.
2. Select Clear Conflicts Evaluation.
 |
• When a new branch is created, conflict evaluation is enabled against the main branch by default.
• Once the conflict evaluation branch is set, conflict evaluation is performed against the specified branch irrespective of the active branch set at the time.
|
Merging into the Active Branch
You can merge design changes from one branch into the current active branch or from active branch to another branch.
1. In the collaboration history, select the branch in which a change is to be merged. If the current branch is not active, right-click and select Activate to activate the branch.
2. Select the latest change from other branch or version to be merged in the active branch and right-click.
If you want to merge a change that is not the latest, create a version on that change and then perform the merge action.
3. In the context menu, select Merge into Active Branch. The selected change is merged and appears as the latest change in the active branch.
If modifications are made to a model in both active branch and in the originating branch, then a merge conflict is created. Select a change from any one branch to proceed.
|
|
• Merge operation offers design flexibility to pick and choose which design is to be selected from either branch. This needs to be used carefully as Creo+ is a parametric system and the design practice involves complex array of references and dependencies. Mixing changes may result in combining incompatible changes, unintended changes in the original design, and may lead to loss of data.
• Always perform full regeneration using the regeneration manager after completion of the merge operation to ensure the data integrity of resulted assembly.
• You can restore to an older change if the merge result is not satisfactory.
The merge action creates a change only on currently active branch.
|