From 7536aba47422cff00b1bf931e83a8838d6412365 Mon Sep 17 00:00:00 2001 From: Gulum Date: Sat, 6 Jun 2026 11:49:35 +0200 Subject: [PATCH] =?UTF-8?q?data(import):=20conflict-decisions.json=20+=20D?= =?UTF-8?q?3=20Firefly=20resolved=20(D-=20correct,=20DD=20typo)=20?= =?UTF-8?q?=E2=80=94=20Julian?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HUMANQUESTION.md | 2 +- tools/import/conflict-decisions.json | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 tools/import/conflict-decisions.json diff --git a/HUMANQUESTION.md b/HUMANQUESTION.md index d912548..379f98c 100644 --- a/HUMANQUESTION.md +++ b/HUMANQUESTION.md @@ -84,7 +84,7 @@ Alle Details (sämtliche Genotyp-Varianten + Quelldateien): `tools/import/output ~~Ella · Roswitha · Silenos gen. Adonis · Brandon Stark · Enya~~ (erledigt) ### D3 · Genotyp: **kleine Abweichung** (eine Quelle genauer als die andere — `DD`↔`D-`, `PP`↔`P-`, `Ee`↔`E`, mit/ohne `spsp`) — welche stimmt? -Firefly v.d. K.C. (*18.12.2019, DD↔D-) · Zuleika v.d. K.C. (*24.10.2015) · WildFire v.d. K.C. (*05.10.2017, PP↔P-) · Milka of LennyLengo (*09.12.2018) · Silvain v.d. K.C. (*27.03.2022) · Daja of Little Rose (*16.05.2021, spsp) · Ichika v.d. K.C. (*19.04.2020) · Chelsea v.d. K.C. (*02.04.2021) +~~Firefly v.d. K.C. (*18.12.2019, DD↔D-)~~ ✅ **D- ist richtig** (DD war ein Tippfehler) — Julian 2026-06-06 · Zuleika v.d. K.C. (*24.10.2015) · WildFire v.d. K.C. (*05.10.2017, PP↔P-) · Milka of LennyLengo (*09.12.2018) · Silvain v.d. K.C. (*27.03.2022) · Daja of Little Rose (*16.05.2021, spsp) · Ichika v.d. K.C. (*19.04.2020) · Chelsea v.d. K.C. (*02.04.2021) ### D4 · **Marker** unterschiedlich (`WP` / `DP` / `WFNZ` / „hörend" mal vorhanden, mal nicht) — welcher gilt? Vestra von den Schlossmäusen (*08.02.2019, WP) · Hedwig of BGB (*30.10.2019, DP + hörend) · Pitari gen. Piti v.d. K.C. (*16.05.2021, DP) · Little Hero of Black Forest (*22.02.2018, WFNZ ± spsp) · Victoria Welby gen. Welby v.d. K.C. (*16.01.2023, DP + Genotyp Ee[f]↔ee[f]) diff --git a/tools/import/conflict-decisions.json b/tools/import/conflict-decisions.json new file mode 100644 index 0000000..9921398 --- /dev/null +++ b/tools/import/conflict-decisions.json @@ -0,0 +1,12 @@ +{ + "_doc": "Human conflict resolutions for the import quarantine (HUMANQUESTION section D / C6). The importer consumes this to UN-QUARANTINE an animal: for a matching (name + dob) it accepts `genotype` (and/or `farbschlag`) as authoritative and skips the conflict. Key match = normalize(name) + dob, same identity as dedup. Maintained by god (Michael) as Julian/his wife answer the D-conflicts; originals (xlsx) stay read-only.", + "resolutions": [ + { + "name": "Firefly von den Kleinen Chaoten", + "dob": "18.12.2019", + "decision": "D-locus = D- (the DD in one source was a typo)", + "genotype": "Aa c[chm]c[chm] D- Ee Gg PP Spsp", + "source": "Julian 2026-06-06 — HUMANQUESTION D3" + } + ] +}