Git Intermediate About 30 min +230 XP

Release Config Merge Stops in Conflict

Merging release/config into main stops on a conflict in deploy/config.yaml, so the checkout retry change cannot ship.

Stage 5 of 7 in Friday Deploy Meltdown.

Briefing

The release pipeline's merge step stopped on release/config an hour ago, and the checkout retry change is stuck behind it.

Since the branch was cut, main picked up an incident change that set a safer timeout, while the release branch was tuned separately and carries its own timeout alongside the new retries.

Both changes were reviewed, but never against each other.

Dev suggests taking the release branch's copy of the file wholesale.

The fix is yours to find: hints, the recovery checks and the debrief unlock inside the incident.

How it plays

  1. 01

    Get paged

    The alert fires and the clock starts. Read the page and the briefing.

  2. 02

    Investigate

    Work in a simulated shell with realistic output: logs, configs, services.

  3. 03

    Fix it

    Change the system the way you would in production. Hints are there if you get stuck.

  4. 04

    Prove it

    Automated checks verify the recovery, then the debrief explains what happened.

Your pager is ready.

Free, instant, and it works on your phone. No signup: start as a guest and save your progress later.