Agent - Weekly merge
Every Saturday evening, it merges into a Unity project's main branch every branch that goes in without conflict and passes the tests.
%%{init: {"flowchart": {"curve": "step"}}}%%
flowchart LR
A["Saturday 8 pm: a free workstation is booked"] --> B["Fresh clone, marker tag pushed"]
B --> C["Each branch, oldest first"]
C -->|"conflict"| D["Merge aborted, branch to the report"]
C -->|"clean"| E["Kept in the stack"]
E --> F["Unity build and EditMode tests"]
F -->|"red"| G["Guilty branch taken out, to the report"]
G --> F
F -->|"green"| H["Main branch pushed, fast-forward only"]
H --> I["Report: merged, and one decision per blocked branch"]
D --> I
English · Français
What sews together goes in; the rest becomes a question.
What it does
- Plants a marker before any merge: a tag
fusion/avant-<date> is set and pushed on the main branch, so going back is a single command.
- Tries each branch, sets conflicts aside. One branch at a time, oldest to newest, merged without fast-forward. A conflict aborts the merge of that branch, which goes to the report with the files touched, the authors and what each one changes.
- Builds and tests, takes out the guilty branch. Unity in batch mode, EditMode tests, on the merged state. If it is red, the agent removes the branches one by one until it finds the guilty one, takes it out of the stack and starts again until green. PlayMode tests, some of which depend on the network, are not run, and the report says so.
- Pushes without forcing, one decision per blocked branch. Fast-forward push only, never
--force. If the main branch moved in the meantime, the agent builds and tests again on the new base.
It is meant for a team where several people and several agents each work in their own branch of the same project. Merging a little every week costs less than merging everything once a month: the agent does the mechanical part (try, build, test, roll back) and only keeps for humans what needs a choice.
The report
Fusionné
feature/menu-pause → a1b2c3d
fix/collisions-sol → e4f5a6b
Repère : fusion/avant-2026-11-14 · Tests EditMode : 142 / 142 · PlayMode non lancés
Décisions à prendre
feature/nouvel-inventaire : conflit avec master sur InventoryUI.cs (deux mises en page différentes).
A — garder celle de la branche B — garder celle de master C — la reporter d'une semaine
D — autre chose
(fictional example; the report is written in French)
What it never does
- Delete a branch, rewrite history, force-push.
- Send anything to a device, publish a release, touch the app store.
- Make noise: the workstation stays silent and Unity runs muted.
- Ask a question: it works alone and puts in the report everything it could not settle.
Requirements
Taken from lancer.sh and consigne.md:
- A server with
bash, GNU date, cron, python3, ssh and scp, that runs lancer.sh.
- A project whose main branch is called
master (the instructions push master).
- A workstation manager, a Python script, that lends and takes back workstations (
demander / rendre), and a launcher that starts a Claude Code agent on a workstation (<ssh host> <name> <instructions>).
- The workstation: a Windows machine reachable by SSH, with Unity, git and a key that can push to the project repository.
- Claude Code on the workstation.
Install
git clone https://github.com/anthohunt/agent-fusion-hebdomadaire
cd agent-fusion-hebdomadaire
cat > reglages.local <<'EOF'
PROJET="mon-jeu"; NOM="fusion"
RAPPORTS=$HOME/fusion/rapports
GESTIONNAIRE=$HOME/outils/postes.py # demander <poste> --nom --besoin / rendre <poste> --nom
SIGNAUX=$HOME/fusion/signaux.jsonl
POSTES="poste-a poste-b"
LANCEUR_POSTE=$HOME/outils/agent-poste # <hôte ssh> <nom> <consigne>
DEPOT="[email protected]:equipe/mon-jeu.git"
UNITY="6000.3.12f1"
EOF
./lancer.sh essai
# crontab with the server on Paris time: Saturday 8 pm, catch-up Sunday 9 am
# 0 20 * * 6 /path/lancer.sh
# 0 9 * * 0 RATTRAPAGE=1 /path/lancer.sh
lancer.sh essai shows the settings and the day's instructions without booking a workstation or starting anything. The Sunday catch-up run does nothing if Saturday's report exists.
Files
| File | Role |
|---|
lancer.sh | Books a workstation, starts the agent, follows it (600 checks one minute apart, about 10 hours), brings back the report, wipes the working copy once the report is back (otherwise it stays on the workstation), hands the workstation back, signals the result to the manager. |
consigne.md | The instructions given to the agent, with fields ({{DEPOT}}, {{UNITY}}, {{DATE}}…) filled in at launch. |
reglages.local | The settings of the installation (repository address, Unity version, workstations, local tools), outside the repository. |
The instructions and comments are in French. It is one of the permanent agents that run on their own every day or every week in a small system of Claude Code agents.
Its page
Version française
Agent - Fusion hebdomadaire
Chaque samedi soir, il fusionne dans la branche principale d'un projet Unity toutes les branches qui passent sans conflit et réussissent les tests.
This is the beginning of the README. Read the rest at the original. Read the full README ↗
