merge
verbmutateMerge a reference, regenerate the generated files that conflict and report the conflicts in files a person wrote.
Program repoctl-public. Origin repoctl.
Governance: the action
What the verb is and may do, as governance says it. Each annotation is expressed by the surfaces or says why it is not.
| Property | Value |
|---|---|
kind | action |
effect | mutate |
idempotent | false |
audience | both |
tier | contributor |
dryRun | false |
check | false |
reachChannels | local, mcp |
reachReadOnly | false |
reachNeedsTty | false |
reachRunsAs | caller |
reachConfirmation | none |
Operands
| Operand | Meaning |
|---|---|
REF | The branch, tag or commit to merge into the checkout. |
Options
| Option | Meaning | Properties |
|---|---|---|
--json | Write one JSON document and nothing else for a person. | type=flag, required=false, standard=true, humanOnly=false, negatable=false, default=false |
--quiet | Show only how it ended. | type=flag, short=q, required=false, standard=true, humanOnly=false, negatable=false, default=false |
--verbose | Show every step as it happens. | type=flag, short=v, required=false, standard=true, humanOnly=false, negatable=false, default=false |
--color | Use colour where the terminal shows it (--no-color turns it off). | type=flag, required=false, standard=true, humanOnly=false, negatable=true, default=true |
--non-interactive | Never ask a question: where one is needed, fail and say so. | type=flag, required=false, standard=true, humanOnly=false, negatable=false, default=false |
Examples
repoctl merge origin/main # Merge main; a generated file that conflicts is made again, never resolved by hand.
repoctl merge some-branch # Merge a branch; a conflict in a file a person wrote is reported and left as Git left it.Physical: what it is drawn as
Not drawn by any surface for this tier.
Not drawn
- cli: merge is for the tier contributor; this caller holds public
- mcp: merge is for the tier contributor; this caller holds public
- rest: merge is for the tier contributor; this caller holds public