The merge conflict in the release branch

Resolve the conflict, preserve both intended changes, and verify the merge.

15 min/Git / conflict markers / verification

Observe

Investigate

Fix

Verify

Reflect

src/config.js/diff

01020304050607

<<<<<<< HEAD
export const API_URL = "/api";
=======
export const API_URL = "https://api.devfixes.test";
>>>>>>> feature/remote-api

export const RETRIES = 3;

Terminal0 runs

Auto-merging src/config.js
CONFLICT (content): Merge conflict in src/config.js
Automatic merge failed; fix conflicts and then commit the result.

Git is waiting for conflict markers to be removed.