gitbutlerapp/gitbutler · error · anyhow::Error

line {line_number}: merge does not accept a message clause

Error message

line {line_number}: merge does not accept a message clause

What it means

Raised by `parse_integration_steps_script` when a `merge` line carries a `| message=...` clause. Like pick, merge takes no message; only squash supports the optional message clause.

Source

Thrown at crates/but-workspace/src/branch/integrate_branch_upstream/parsing.rs:62

                if message_part.is_some() {
                    bail!("line {line_number}: pick does not accept a message clause");
                }
                if arguments.len() != 1 {
                    bail!("line {line_number}: pick requires exactly one commit");
                }
                let commit = arguments
                    .first()
                    .copied()
                    .expect("validated pick arity above");
                InteractiveIntegrationStep::Pick {
                    commit_id: resolve_commit(commit, &allowed_commits).map_err(|err| {
                        anyhow::anyhow!("line {line_number}: invalid pick commit: {err}")
                    })?,
                }
            }
            "merge" => {
                if message_part.is_some() {
                    bail!("line {line_number}: merge does not accept a message clause");
                }
                if arguments.len() != 1 {
                    bail!("line {line_number}: merge requires exactly one commit");
                }
                let commit = arguments
                    .first()
                    .copied()
                    .expect("validated merge arity above");
                InteractiveIntegrationStep::Merge {
                    commit_id: resolve_commit(commit, &allowed_commits).map_err(|err| {
                        anyhow::anyhow!("line {line_number}: invalid merge commit: {err}")
                    })?,
                }
            }
            "squash" => {
                if arguments.len() < 2 {
                    bail!("line {line_number}: squash requires at least two commits");
                }

View on GitHub (pinned to caf1f223d3)

Solutions

1. Drop the clause: `merge 7d1e00f`.
2. If a specific merge message is needed, express it via a squash step or set the message after integration with a follow-up amend.

Example fix

# before
merge 7d1e00f | message="integrate upstream"

# after
merge 7d1e00f

if let Err(err) = parse_integration_steps_script(&script, &divergence) {
    // message contains 'line {n}: merge does not accept a message clause'
    highlight_line_in_editor(&err);
}

When it happens

Trigger: Script line like `merge 7d1e00f | message="merge msg"`. Any attempt to supply a merge-commit message via the clause hits this bail.

Common situations: Hand-editing the integration script and assuming merge (which produces a merge commit) accepts a message parameter; copying a squash line's syntax onto a merge line.

Related errors

• line {line_number}: pick does not accept a message clause
• line {line_number}: pick requires exactly one commit
• line {line_number}: merge requires exactly one commit
• line {line_number}: squash requires at least two commits
• line {line_number}: unknown command '{other}'

AI-assisted analysis of gitbutlerapp/gitbutler@caf1f223d3 (2026-08-20). Data as JSON: /api/errors/5b08d5c8ff45ee98. Report an issue: GitHub.