Merging combines the changes from one branch (the source) into another branch (the target). Conflicts are reviewed and resolved before the merge completes, so Creators retain full control over what ends up in the result.
Whether a published version can be the target depends on the merge mode. In conflict-resolution mode the target must be a branch, because the merge writes into it and published versions are read-only. In accept-changes mode a published version can be the target, because the merge writes its result to a new branch instead. In neither mode can both sides be published versions.
Merge Modes
The merge workflow resolves differences at one of two levels, depending on environment settings. Both levels complete a merge.
- Conflict resolution: Work through each changed module and resolve its differences component by component. The merge writes the result into the target branch. The steps below cover this mode.
- Accept changes: Review every changed module and workflow, then accept the ones to take from the source. Anything left unaccepted keeps the target's version. Name an output branch, and the merge writes its result there instead of into the target, creating a third branch that synthesizes two independent lines of work and leaves the originals in place.
The UnqorkAI platform determines which mode is active automatically based on environment configuration.
In accept-changes mode, neither original branch receives the merged content, but any unsaved changes on both are committed before the merge runs. Start the merge only when ready to commit both sides.
In accept-changes mode, changed modules are reviewed in Merge Review, where a Private Smart Component displays as a read-only definition card. See Private Smart Components.
Step 1: Select Branches
To begin a merge, open the merge workflow from either of the following locations:
- Checkout pill: In the module toolbar, click the checkout pill and select
Start a Merge....
- Application row menu: Right-click a versioned application in the Explorer panel and select
Start a Merge....
When the merge workflow opens, a persistent bar at the top displays Source and Target dropdowns. Select a source (the branch or version with incoming changes) and a target (the branch or version to receive the changes). Use the swap button to reverse the direction. The conflict resolution view loads automatically once a valid pair is selected.
The source and target cannot be the same branch. At least one side must be a branch, in either mode. Two published versions cannot be merged.
Step 2: Resolve Conflicts
The conflict resolution step displays all modules that have differences between the source and target branches.
Summary Bar
A summary bar at the top of the merge surface displays the scope of the merge:
- Tiles: Modules impacted (with component count), total conflicts, total changes (with auto-merged count), and dependencies.
- Progress bar: Displays how many conflicts are resolved out of the total.
- Compared readout: Displays when the comparison was last run and how many changes and unresolved conflicts remain. If the target branch changes after the merge opens, the diff is stale. Select Recompute comparison from the
(ellipsis) in the merge bar to reload it against the current state of both branches.
Use the All / Conflicts / Changes scope tabs to filter the view. The selected scope narrows both the module stack and the jump-navigation rail together.
Module Stack
Modules with differences display as collapsible sections in a scrollable stack. Each section contains the components with changes for that module. Conflict-bearing sections default to expanded. Change-only sections default to collapsed. Sections with more than 100 conflicts begin folded to preserve performance.
To navigate directly to a section, use the jump-navigation rail to the side of the stack.
Resolving Conflicts
Each component displays its changes as rows in a table. Each row shows the conflicting values side by side, with columns headed by the branch names. A Status chip shows the state of each row:
- Pick One: The conflict has not been resolved yet.
- Approved: A side has been selected.
- Auto-approved: The platform resolved the row automatically with no action needed.
Components that exist only on one side — added in the source or removed in the target — are collapsed by default. Select the row to expand it and review the full component definition.
A Private Smart Component instance that only one branch added displays under its definition card instead. The card offers a choice to keep it or leave it out. See Private Smart Components.
To resolve a conflict, click the value cell for the side to keep. Clicking a cell tints it and marks it as the selected side, changing the row status to Approved.
For more complex differences, adjust the configuration manually to preserve what is needed from both sides.
Private Smart Components
A Private Smart Component is versioned with its module, so a merge compares the definition each branch pinned. The component displays as a definition card, and the module's instances of it nest below the card. Resolve the definition first, then its instances.
Definition Card
The card header names the component, its type in the subline (Smart Component Definition · UI, Logic, or Query), and a status pill:
- 0 of 1 resolved: Both branches changed the definition, and no side is picked yet.
- Resolved: A side is picked.
- Auto-approved: Only one branch changed the definition, so the platform kept that side.
Below the header, a panel for each branch displays that branch's definition. Click Pop out on a panel to open the definition in a read-only preview.
To keep a definition, click its panel. Alternatively, click the (ellipsis) in the card header and select Use followed by the branch name. The kept panel displays a Keeping badge. Select Reset from the same menu to clear the pick, or Open to preview the kept definition.
The merged module keeps one branch's whole definition, at the revision that branch pinned. Changing the pick resets every instance choice that depends on it.
Impact and Show What Changed
The Impact box lists what the pick changes for the component's instances and downstream bindings. For example, it names the inputs or return value that keeping a branch adds or removes. Until a side is picked, the box prompts for a definition.
Click Show what changed to compare the Interface and Tests of both definitions in a table. A field or test that exists on only one side is tagged + added or - removed, read from the source to the target. The definition panels display behavior changes.
Instances
Each instance of the component displays as a card under the definition. Until the definition is picked, instances are locked and display Waiting. After the pick, each instance displays its rows to resolve and a status pill: Unchanged, Resolved, or the count of rows resolved.
An instance can also display one of the following:
- Doesn't fit: The instance binds a property that the kept definition does not declare. A warning in the instance's rows names the kept definition and lists each property as not in branch definition. When the other branch's definition declares the property, the warning says it only exists on that definition, and Use branch definition instead switches the pick. A doesn't-fit warning does not block the merge.
- Only on branch: Only one branch added the instance. Choose Added · keep in module (the default) or Not in module to leave it out. When every instance of a definition is left out, the definition is not added to the merged module either.
- Public Smart Component: The instance uses a Public Smart Component. Its definition lives in the Smart Components Hub and is not versioned with the module, so only the instance's configuration merges.
When one branch removed an instance and the other changed it, the instance's rows compare both sides. Pick the branch that removed it to leave it out of the merged module, or the branch that changed it to keep it.
If the platform cannot read a definition, an instance, or the differences, a note displays with Try again. A failed read never blocks the merge: picking still works, and instances unlock.
Limits
Merge resolves the following at a coarser level than a module component's rows:
- Bindings: An instance's bindings are picked as a whole.
- Doesn't fit: An instance that doesn't fit the kept definition has no choice to drop the unmatched bindings or remove the instance. Switch the definition, or fix the instance after the merge.
- Behavior: The definition panels display behavior changes, but they have no rows to pick.
Merge Review
In accept-changes mode, Merge Review displays the same definition card read-only. Creators can compare the panels and open Show what changed, but the card has no pick, Keeping badge, Impact box, locked instances, or doesn't-fit warnings.
Bulk Resolution
To resolve all remaining conflicts at once, click the (ellipsis) in the merge bar and select Resolve all with source or Resolve all with target. If any conflicts have already been manually resolved, a confirmation dialog displays before overwriting them.
Data Workflow Modules
For Data Workflow modules, the conflict resolution view displays three synchronized canvases side by side:
- Source: The incoming state from the source branch.
- Target: The existing state from the target branch.
- Merged: A preview of the merged result based on the resolution choices made.
Select nodes and links in the Source or Target canvas to apply them to the Merged canvas. The Advanced Mode view is available to Creators with Viewer access.
Step 3: Complete the Merge
When all conflicts are resolved, click Merge in the merge bar. The Complete merge dialog opens and validates the resolution automatically.
When validation passes, select a Merge strategy:
- Update target: Merges source changes directly into the target branch.
- Create new branch: Creates a new branch with the merged result. Enter a name for the new branch.
Under Clean up after merging, choose the branches to remove once the merge succeeds. The merged result keeps the changes from both branches. Each option displays only when that branch can be deleted:
- Delete source branch after merging: Displays when the source is a branch. Published versions cannot be deleted.
- Delete target branch after merging: Displays when Create new branch is selected and the target is a branch. The merged result lands in the new branch, so the target is no longer needed.
The section does not display when neither branch can be deleted.
If a Warnings alert displays, the merge detected orphaned components: components the platform cannot place in the existing layout structure. The platform places them in a new panel at the top of the affected module. Select I acknowledge these warnings and want to proceed to continue.
Click Merge in the dialog to run the merge. A progress indicator displays while the merge runs. When it finishes, the platform navigates back to the application.
If the merge placed orphaned components in a new panel, reorganize them into the correct layout and delete the automatically created panel after reviewing the result.
Changelog
| Date | Change |
|---|---|
| 2026-11-12 | Added Private Smart Components: the definition card, locked instances, Impact, Show what changed, one-branch-only and remove-versus-modify instances, merge limits, and the read-only card in Merge Review. |
| 2026-09-02 | Added Recompute comparison note; added collapsed one-sided rows behavior; noted Advanced Mode Viewer available to Viewers. |
| 2026-08-26 | Corrected Step 1 (Source/Target are dropdowns, no Next button); corrected Blanket Resolution to Bulk Resolution (merge bar ellipsis only); corrected Step 3 strategy labels (Update target / Create new branch) and Complete merge dialog flow. |
| 2026-08-21 | Rewrote Step 2 for the rebuilt merge surface: collapsible module stack, in-row resolution, scope tabs, blanket resolution, summary bar. Added application row menu as a second entry point. |
| 2026-08-13 | Corrected the merge-target note per mode, stated that accept-changes commits pending changes on both branches, and folded in the unpublished Combining Branches draft. |
| 2026-08-12 | Replaced "Merge vs. Compare" with the two merge modes: both now complete a merge. |
| 2026-07-17 | Added pill image, inline icons, conflict pill note, and orphaned components warning; editorial pass. |
| 2026-07-15 | Initial publication. |