IF Commons GitHub

merge

verbmutate

Merge a reference, regenerate the generated files that conflict and report the conflicts in files a person wrote.

Program repoctl-releaser. 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.

PropertyValue
kindaction
effectmutate
idempotentfalse
audienceboth
tiercontributor
dryRunfalse
checkfalse
reachChannelslocal, mcp
reachReadOnlyfalse
reachNeedsTtyfalse
reachRunsAscaller
reachConfirmationnone

Operands

OperandMeaning
REFThe branch, tag or commit to merge into the checkout.

Options

OptionMeaningProperties
--jsonWrite one JSON document and nothing else for a person.type=flag, required=false, standard=true, humanOnly=false, negatable=false, default=false
--quietShow only how it ended.type=flag, short=q, required=false, standard=true, humanOnly=false, negatable=false, default=false
--verboseShow every step as it happens.type=flag, short=v, required=false, standard=true, humanOnly=false, negatable=false, default=false
--colorUse colour where the terminal shows it (--no-color turns it off).type=flag, required=false, standard=true, humanOnly=false, negatable=true, default=true
--non-interactiveNever 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

repoctl merge

cli-command. Merge a reference, regenerate the generated files that conflict and report the conflicts in files a person wrote.

PropertyValue
usagerepoctl merge
wordsmerge
tiercontributor

repoctl_merge

mcp-tool. Merge a reference, regenerate the generated files that conflict and report the conflicts in files a person wrote. (action, effect mutate.)

PropertyValue
titlerepoctl merge
toolNamerepoctl_merge
readOnlyHintfalse
destructiveHintfalse
idempotentHintfalse
inputsREF
requiredREF
tiercontributor

Not drawn

  • rest: its reach policy does not name the rest channel

Titles, headings, exports, tables, columns and requirements. Esc closes.