You are viewing the documentation for Blueriq 17. Documentation for other versions is available in our documentation directory.

When you want to merge two branches, it is possible that conflicts will arise. This happens when a specific element is changed or created in both branches. The system cannot decide which change is leading, so you will have to solve each conflict manually. Before the actual merge takes place, a list of conflicts is presented. If you decide to continue the merge, you will have to open the updated branch in order to resolve the conflicts.

When you open a branch that has unresolved conflicts, a message will appear at the bottom of the screen in the navigation panel, for example:

Clicking the message will open a window with a list of all conflicts.

There are four different types of conflicts:

  1. Duplicate name conflict: Two objects with the same name were created in the same module but in different branches. This conflict can also occur if you rename objects. In this case, both definitions are available in the domain for you to inspect.

  2. Content conflict: The same object was updated in 2 different branches, but the update was not the same. You have to choose which definition you want to keep.

  3. Delete conflict: An object was deleted in a branch, while in the other branch, the object was edited.

  4. Parent conflict: In one branch the complete module was deleted, while in the other the definition of an object has changed. If you decide to keep the new object definition, you will again get the module, but with only the new definition inside it.

For each type of conflict, Blueriq Encore will explain what happened, what the current state is, and give options on how to resolve the conflict.

  • No labels