{"record":{"id":"27295d3f5094db3d","repo":"gitbutlerapp/gitbutler","slug":"line-line-number-merge-requires-exactly-one-com","errorCode":null,"errorMessage":"line {line_number}: merge requires exactly one commit","messagePattern":"line (.+?): merge requires exactly one commit","errorType":"validation","errorClass":"anyhow::Error","httpStatus":null,"severity":"error","filePath":"crates/but-workspace/src/branch/integrate_branch_upstream/parsing.rs","lineNumber":65,"sourceCode":"                if arguments.len() != 1 {\n                    bail!(\"line {line_number}: pick requires exactly one commit\");\n                }\n                let commit = arguments\n                    .first()\n                    .copied()\n                    .expect(\"validated pick arity above\");\n                InteractiveIntegrationStep::Pick {\n                    commit_id: resolve_commit(commit, &allowed_commits).map_err(|err| {\n                        anyhow::anyhow!(\"line {line_number}: invalid pick commit: {err}\")\n                    })?,\n                }\n            }\n            \"merge\" => {\n                if message_part.is_some() {\n                    bail!(\"line {line_number}: merge does not accept a message clause\");\n                }\n                if arguments.len() != 1 {\n                    bail!(\"line {line_number}: merge requires exactly one commit\");\n                }\n                let commit = arguments\n                    .first()\n                    .copied()\n                    .expect(\"validated merge arity above\");\n                InteractiveIntegrationStep::Merge {\n                    commit_id: resolve_commit(commit, &allowed_commits).map_err(|err| {\n                        anyhow::anyhow!(\"line {line_number}: invalid merge commit: {err}\")\n                    })?,\n                }\n            }\n            \"squash\" => {\n                if arguments.len() < 2 {\n                    bail!(\"line {line_number}: squash requires at least two commits\");\n                }\n                let commits = arguments\n                    .iter()\n                    .map(|commit| {","sourceCodeStart":47,"sourceCodeEnd":83,"githubUrl":"https://github.com/gitbutlerapp/gitbutler/blob/caf1f223d3cfb94488c9198ad34487c6006c648f/crates/but-workspace/src/branch/integrate_branch_upstream/parsing.rs#L47-L83","documentation":"Raised by `parse_integration_steps_script` when a `merge` line does not have exactly one argument after whitespace tokenization. Merge is strictly `merge <commit-spec>`.","triggerScenarios":"Lines like `merge` alone, `merge 7d1e 4f2a`, or `merge 7d1e00f extra words` (e.g. a pasted commit subject).","commonSituations":"Copying git-rebase todo lines that include subjects after the SHA; typos that split or duplicate the spec.","solutions":["Use exactly one commit spec: `merge 7d1e00f`.","Strip commit subjects when pasting from `git rebase -i` todos."],"exampleFix":"# before\nmerge 7d1e00f merge branch 'origin/main'\n\n# after\nmerge 7d1e00f","handlingStrategy":"validation","validationCode":null,"typeGuard":null,"tryCatchPattern":"if let Err(err) = parse_integration_steps_script(&script, &divergence) {\n    // 'line {n}: merge requires exactly one commit' -> point user at that line\n}","preventionTips":["Validate before apply; the parser's line-numbered errors are designed for editor feedback.","Keep merge lines to `merge <prefix-or-sha>` only."],"tags":["rust","git","but-workspace","integration","todo-script","parsing","arity"],"backgroundTag":"rebase-todo-parse-error","analyzedSha":"caf1f223d3cfb94488c9198ad34487c6006c648f","analyzedAt":"2026-08-20T07:55:40.983Z","schemaVersion":2},"datasetVersion":"2026-08-31T14:17:45.589Z"}