A merge draft is a JSON file that pins both branch heads, the policy epoch and the plan. conflict list --save writes it, conflict resolve updates it, and branch merge approve --approval FILE merges with it. A draft goes stale when either branch moves.
wiele conflict list
List conflicts between a branch and its merge target.
wiele conflict list [flags] <branch>
| Argument |
Description |
<branch> |
Branch name or ID. |
| Flag |
Description |
--into string |
Branch to merge into. |
--save string |
Write a pinned merge draft for conflict resolve and merge approve. |
--workspace string |
Workspace ID, slug or name. Not needed inside a checkout or when the path is written as WORKSPACE:/path. |
--org string |
Organization ID or slug. Default: the checkout's organization when the workspace comes from the checkout, otherwise the one picked with wiele org use. |
wiele conflict show
Show one conflict and a bounded target-to-source text diff.
wiele conflict show [flags] <path-or-resource-id>
| Argument |
Description |
<path-or-resource-id> |
Path or resource ID of the conflicting file. |
| Flag |
Description |
--workspace string |
Workspace ID, slug or name. Not needed inside a checkout or when the path is written as WORKSPACE:/path. |
--org string |
Organization ID or slug. Default: the checkout's organization when the workspace comes from the checkout, otherwise the one picked with wiele org use. |
--plan string |
Required. Merge draft saved by wiele conflict list --save. |
wiele conflict export
Download the base, target and source originals of a conflict.
wiele conflict export [flags] <path-or-resource-id>
| Argument |
Description |
<path-or-resource-id> |
Path or resource ID of the conflicting file. |
| Flag |
Description |
--workspace string |
Workspace ID, slug or name. Not needed inside a checkout or when the path is written as WORKSPACE:/path. |
--org string |
Organization ID or slug. Default: the checkout's organization when the workspace comes from the checkout, otherwise the one picked with wiele org use. |
--plan string |
Required. Merge draft saved by wiele conflict list --save. |
--output string |
Required. New folder for the base, target and source files. |
wiele conflict resolve
Record a whole-file resolution in a saved merge draft, or publish a resolved file.
wiele conflict resolve [flags] <path-or-resource-id>
| Argument |
Description |
<path-or-resource-id> |
Path or resource ID of the conflicting file. |
| Flag |
Description |
--workspace string |
Workspace ID, slug or name. Not needed inside a checkout or when the path is written as WORKSPACE:/path. |
--org string |
Organization ID or slug. Default: the checkout's organization when the workspace comes from the checkout, otherwise the one picked with wiele org use. |
--plan string |
Required. Merge draft saved by wiele conflict list --save. |
--take source|target|delete |
Keep the source file, keep the target file, or delete it. |
--file string |
Publish this local file to the source branch and take it. |
--wait string |
How long to wait for the --file push. Default: 30s. |
