{"record":{"id":"875ac4ab541d513d","repo":"openai/codex","slug":"git-apply-failed-applied-skipped-conflict","errorCode":null,"errorMessage":"Git apply failed (applied={}, skipped={}, conflicts={})\\nstdout:\\n{}\\nstderr:\\n{}","messagePattern":"Git apply failed \\(applied=(.+?), skipped=(.+?), conflicts=(.+?)\\)\\\\nstdout:\\\\n(.+?)\\\\nstderr:\\\\n(.+?)","errorType":"exception","errorClass":"anyhow::Error","httpStatus":null,"severity":"error","filePath":"codex-rs/chatgpt/src/apply_command.rs","lineNumber":66,"sourceCode":"        _ => None,\n    });\n    match output_diff {\n        Some(output_diff) => apply_diff(&output_diff.diff, cwd).await,\n        None => anyhow::bail!(\"No PR output item found\"),\n    }\n}\n\nasync fn apply_diff(diff: &str, cwd: Option<PathBuf>) -> anyhow::Result<()> {\n    let cwd = cwd.unwrap_or(std::env::current_dir().unwrap_or_else(|_| std::env::temp_dir()));\n    let req = ApplyGitRequest {\n        cwd,\n        diff: diff.to_string(),\n        revert: false,\n        preflight: false,\n    };\n    let res = apply_git_patch(&req)?;\n    if res.exit_code != 0 {\n        anyhow::bail!(\n            \"Git apply failed (applied={}, skipped={}, conflicts={})\\nstdout:\\n{}\\nstderr:\\n{}\",\n            res.applied_paths.len(),\n            res.skipped_paths.len(),\n            res.conflicted_paths.len(),\n            res.stdout,\n            res.stderr\n        );\n    }\n    println!(\"Successfully applied diff\");\n    Ok(())\n}\n","sourceCodeStart":48,"sourceCodeEnd":78,"githubUrl":"https://github.com/openai/codex/blob/339751715c64496cb86246bfb3935f40e309dd3d/codex-rs/chatgpt/src/apply_command.rs#L48-L78","documentation":"Error \"Git apply failed (applied={}, skipped={}, conflicts={})\\nstdout:\\n{}\\nstderr:\\n{}\" thrown in openai/codex.","triggerScenarios":"Thrown at codex-rs/chatgpt/src/apply_command.rs:66 when the library encounters an invalid state.","commonSituations":"See trigger scenarios.","solutions":[],"exampleFix":null,"handlingStrategy":null,"validationCode":null,"typeGuard":null,"tryCatchPattern":null,"preventionTips":[],"tags":[],"backgroundTag":null,"analyzedSha":"339751715c64496cb86246bfb3935f40e309dd3d","analyzedAt":"2026-08-25T05:35:09.876Z","schemaVersion":2},"datasetVersion":"2026-08-25T06:17:31.827Z"}