cub variant conflicts

Show, apply, or dismiss a variant's outstanding merge conflicts

Synopsis

Work with the parts of the last promote's patch that were not applied, across a whole variant.

A merge reports a conflict for every change it could not make: a path the variant protects (ProtectedPath), a path the variant owns (Subtracted), a path that could not be located (UnresolvedPath), a downstream change displaced by an upstream deletion (DeleteShadowed), a value a guard stopped (Guarded), a guard change the merge was not cleared for (GuardWithheld), and a change a mutually exclusive field blocked (ExclusiveWithheld) or made room for (ExclusiveCleared). The merged data is correct as it stands; a conflict says what the source wanted to change and couldn't. "cub unit conflicts" explains each reason in full.

With no flags this lists the outstanding conflicts in every unit of the variant, by the resource they are on. --apply replays the changes they withheld, and --dismiss drops them without touching the configuration data. Both act on every outstanding conflict in the variant unless --reason, --path, or --resource narrows the selection; --resource names one resource the way the function verbs do, as / or //. Both take --dry-run, which reports what would be done and writes nothing.

The variant is named as /, or by its space slug.

Examples:

  # What did the last promote fail to apply?
  cub variant conflicts web/dev

  # What would taking the base's values do?
  cub variant conflicts web/dev --apply --dry-run -o mutations

  # Take them for one resource only
  cub variant conflicts web/dev --apply --resource Deployment/backend

  # Accept the variant as it is and stop reporting them
  cub variant conflicts web/dev --dismiss

cub variant conflicts <variant> [--apply | --dismiss] [--reason REASON] [--path PATH] [--resource <kind>/[<namespace>/]<name>] [flags]

Options

      --apply             apply the changes the selected conflicts withheld
      --dismiss           drop the selected conflicts without changing the configuration data
      --dry-run           dry run mode: report what --apply or --dismiss would do without writing anything
  -h, --help              help for conflicts
  -o, --output string     Output format. One of: json, yaml, name, wide, mutations, jq=<expr>, yq=<expr>, custom-columns=<spec>
      --path string       select conflicts at this path
      --quiet             No default output.
      --reason string     select conflicts with this reason: Subtracted, DeleteShadowed, ProtectedPath, UnresolvedPath, Guarded, GuardWithheld, ExclusiveWithheld, or ExclusiveCleared
      --resource string   select conflicts on one resource, as <kind>/<name> or <kind>/<namespace>/<name>
      --timeout string    completion timeout as a duration with units, such as 10s or 2m (default "10m0s")
      --verbose           Detailed output, additive with default output
      --wait              wait for completion (default true)

Options inherited from parent commands

      --context string   The context to use for this command
      --debug            Debug output

cub variant conflicts