Git merge conflict timeout and load response

When this happens

Use this when the issue appears during traffic spikes, exports, batch jobs, or slow queries. Do not stop at the screen message; validate latency, worker saturation, connection pools, locks, and long-running jobs first.

Symptom checklist

• merge conflict appears repeatedly in the Git UI or logs.
• HEAD, upstream, rebase state, hooks, LFS differs between successful and failed requests.
• The issue appears only after separating local worktree issue from remote rejection.
• It often follows deploys, permission changes, configuration edits, or data refreshes.

Likely causes

• merge conflict specifically changes the investigation surface for Git: verify the exact failing object, route, user, and timestamp before applying the broader pattern.
• Two requests write the same logical record at the same time.
• A retry repeats an insert without an idempotency key.
• The unique index or remote branch is correct but the application does not handle conflict paths.
• Transaction lock order differs between workers.
• A batch job reprocesses already imported rows.
• For the timeout and load case, the first useful clue is latency, worker saturation, connection pools, locks, and long-running jobs.

First 1-minute checks

1. Write down the first failure time, latest change, affected user, path, and object ID.
2. Compare HEAD, upstream, rebase state, hooks, LFS for success and failure in the same window.
3. Test the hypothesis: duplicate or lock conflict caused by concurrent writes, missing idempotency, unique keys, transaction order, or remote state drift.
4. Classify this as timeout and load: latency, worker saturation, connection pools, locks, and long-running jobs.
5. Capture current values before changing configuration.

First evidence

Treat merge conflict as a timeout and load case. First collect evidence for latency, worker saturation, connection pools, locks, and long-running jobs.

Output examples

Normal output

Connect, first byte, and total time stay within the expected budget.

Failing output

Connect time, first byte time, or total time spikes before the error.

Output-to-action branches

• The issue appears during traffic spikes, exports, batch jobs, or slow queries.
  Find whether the delay is network connection, upstream processing, database lock, or worker exhaustion.
• The working and failing outputs differ.
  Act on the differing layer first: For merge conflict, apply the fix only after reproducing the same condition and saving the before/after evidence for this exact code.
• Command output is normal but users still fail.
  Separate browser cache, cookies, permissions, and network location before declaring it fixed.

Do not do this

• Do not only raise timeouts while the synchronous workload remains unchanged.
• Do not change multiple layers before identifying the failing layer.
• Do not delete production data, grant broad permissions, or disable security controls as a first response.

Evidence quality

Auto-generated operator draft: includes issue-specific causes, commands, output branches, and unsafe-action warnings. Official-source links and real incident validation are queued for enrichment.

Commands to run first

grep -R "merge conflict" ./logs

git status --short --branch

git log --oneline --decorate -5

git remote -v

git ls-files -s | head

grep -R "duplicate\|deadlock\|conflict\|lock\|rejected" ./logs

git fetch --all --prune

git status --short --branch

curl -w 'connect=%{time_connect} start=%{time_starttransfer} total=%{time_total}\n' -o /dev/null -s https://example.com

Fix order

1. Record the full merge conflict message, failing URL, user, object ID, and latest change.
2. Collect issue-specific evidence for duplicate or lock conflict caused by concurrent writes, missing idempotency, unique keys, transaction order, or remote state drift.
3. Compare the failing case with a successful case before editing settings.
4. If this is the timeout and load branch, Find whether the delay is network connection, upstream processing, database lock, or worker exhaustion.
5. Re-check with the same command and URL, then record the normal output.

Actions by cause

• For merge conflict, apply the fix only after reproducing the same condition and saving the before/after evidence for this exact code.
• Add an idempotency key or upsert path for repeated writes.
• Use unique constraints intentionally and handle duplicate exceptions.
• Sort lock acquisition order consistently.
• Split batch reprocessing from live writes.
• Fetch remote state before retrying rejected pushes or tags.
• For the timeout and load branch, Find whether the delay is network connection, upstream processing, database lock, or worker exhaustion.

Evidence links

• Git documentation official
• GitHub authentication troubleshooting official

Verification metadata

• operator-draft
• official-reference-linked
• 2026-07-23

Update queue

• Review cadence
  weekly-source-review
• Next enrichment
  Add one official-source check and one real output example for Git merge conflict.

Environment-specific checks

• Shared hosting, proxies, VPNs, or CDN layers can change local worktree issue from remote rejection results.
• Do not trust only the Git UI; compare command output.
• Japanese hosting panels may show completion before DNS or SSL fully propagates.
• Test from both office and external networks.

Prevent it next time

• Store normal examples for HEAD, upstream, rebase state, hooks, LFS.
• Add rebase/merge cleanup, upstream reset, LFS tracking, hook logs to the release checklist.
• Keep recurring errors in the same note format.
• Split alerts by error rate, latency, certificates, disk, and permission changes.

Related notes

• Git merge conflict first triage response
• Git non-fast-forward first triage response
• Git detached HEAD first triage response
• Git permission denied publickey first triage response
• Git large file first triage response
• Git rebase conflict first triage response
• Git submodule first triage response
• Git line endings first triage response