阅读中文版本

Git Merge Conflict Unresolved — CI Fails

Diagnose CI build failures from unresolved git merge conflicts leaving conflict markers (<<<<<<<) in source files.

node -e "require('./repro')"

Set NODE_OPTIONS=--stack-trace-limit=100 and run with verbose logging

Add console.log / debugger / breakpoint at the line before the throw

Symptom and Error Message

When running the CI/CD code, the runtime raises the following error:

error: merge conflict in src/app.ts (CONFLICT (content): Merge conflict)

This error indicates that ci fails to build because source files contain git conflict markers. The error is reproducible and appears consistently once the triggering condition is met. In production, you may see this error sporadically because the triggering condition depends on runtime state that is not always present.

Root Cause Analysis

The fundamental cause is: unresolved merge conflicts leave <<<<<<< ======= >>>>>>> markers in files, causing syntax errors. Two factors converge to produce the visible error. First, a merge or rebase left conflict markers because the developer did not resolve all conflicts. Second, the conflict was committed without running git status to verify resolution. Either factor alone might not trigger the error, but together they create the conditions for failure.

Diagnosis Walkthrough

Start by reproducing the error in isolation. Strip away everything except the minimum code path that triggers the error. Once you have a minimal reproduction, inspect every variable at the failure point. Look for: undefined where an object is expected, wrong types, stale references, and off-by-one indices. The error message tells you what went wrong; the surrounding state tells you why.

Fix and Code Example

// Before (buggy)
// ... code that triggers the error ...

// After (fixed)
// ... corrected code with proper guard or type check ...

The fix addresses the root cause directly: run git status, open conflicted files, resolve each conflict, then git add and commit. After applying the fix, the error no longer occurs because the triggering condition is either prevented or handled gracefully.

Verification

Run git diff –check and confirm no conflict markers; build the project successfully. Run the reproduction case again and confirm the error is gone. Then run the full test suite to check for regressions. In production, monitor error logs for 24 hours to confirm the fix is effective under real load.

Common Pitfalls

A frequent mistake is to suppress the error with a try/catch or conditional without addressing the underlying cause. This masks the symptom but the defective logic remains, and the error will resurface in a different form. Always fix the root cause, not just the error message. Another pitfall is fixing the symptom only in the happy path while ignoring edge cases like empty input, null values, or concurrent access.