Teknium
70151dd549
Adapts the in-place branch update from PR #89507 (@willfrombr) onto the switch-by-default behavior: the deterministic switch path remains the default so non-interactive updates (desktop, gateway, cron) never dead-end on a merge conflict, and deliberate custom-branch users opt in with updates.parked_branch_strategy: update_in_place. --switch-branch overrides the in-place strategy for one run (deep feature branches that must not accumulate update merge commits). Docs + config comments + tests cover all three routes. Co-authored-by: Willian Santos <285090322+willfrombr@users.noreply.github.com>
Contributor email → GitHub login mappings
This directory replaces appending entries to AUTHOR_MAP in
scripts/release.py. The old dict caused constant merge conflicts when
several salvage PRs landed at once — every PR edited the same lines of the
same file. Here, each mapping is its own file, and file additions never
conflict.
Adding a mapping
One file per commit-author email, under emails/:
python3 scripts/add_contributor.py <email> <github-login>
# or by hand:
echo "<github-login>" > contributors/emails/<email>
- File name = the exact commit-author email (as shown by
git log --format='%ae'). - File content = the GitHub login on the first non-comment line.
Lines starting with
#are comments (use them for the PR reference).
Example — contributors/emails/jane.doe@example.com:
janedoe
# PR #12345 salvage (gateway: fix session key routing)
Rules
- Do NOT add new entries to
AUTHOR_MAPinscripts/release.py. That dict is frozen legacy data; the release tooling merges it with this directory (directory entries win on duplicates). - GitHub noreply emails (
<id>+<login>@users.noreply.github.comand<login>@users.noreply.github.com) auto-resolve — no file needed. - The
Contributor Attribution CheckCI job fails a PR whose commits carry an unmapped email; the failure message prints the exact command to run.