<?xml version="1.0" encoding="utf-8"?>
<entry xmlns="http://www.w3.org/2005/Atom" xml:base="https://docs.spec-kitty.ai/adr/1.x/2026-01-23-4-auto-merge-multi-parent-dependencies/">
  <id>https://docs.spec-kitty.ai/adr/1.x/2026-01-23-4-auto-merge-multi-parent-dependencies/</id>
  <title>Auto-Merge Multi-Parent Dependencies</title>
  <updated>2026-01-23T00:00:00.000Z</updated>
  <author><name>Spec Kitty</name></author>
  <link rel="alternate" type="text/html" href="https://docs.spec-kitty.ai/adr/1.x/2026-01-23-4-auto-merge-multi-parent-dependencies/"/>
  <summary>Resolves the diamond-dependency ambiguity by combining every declared parent into one temporary commit, so a work package always starts from a deterministic tree.</summary>
  <content type="html">&lt;h2 id=&quot;context-and-problem-statement&quot;&gt;Context and Problem Statement&lt;/h2&gt;
&lt;p&gt;Work packages can depend on multiple other work packages (diamond dependency pattern). For example:&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;plaintext&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;        &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;WP01 (database)&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;       &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;/    \&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;    &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;WP02    WP03&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;  &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;(users)  (auth)&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;       &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;\    /&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;        &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;WP04&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span class=&quot;indent&quot;&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;     &lt;/span&gt;&lt;/span&gt;&lt;span style=&quot;--0:#d6deeb;--1:#403f53&quot;&gt;(admin UI)&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;WP04 depends on &lt;strong&gt;both&lt;/strong&gt; WP02 and WP03. However, git worktrees can only branch from a &lt;strong&gt;single&lt;/strong&gt; base commit. This created ambiguity:&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Previous approach:&lt;/strong&gt;&lt;/p&gt;
&lt;div class=&quot;expressive-code&quot;&gt;&lt;figure class=&quot;frame is-terminal not-content&quot;&gt;&lt;figcaption class=&quot;header&quot;&gt;&lt;span class=&quot;title&quot;&gt;&lt;/span&gt;&lt;span class=&quot;sr-only&quot;&gt;Terminal window&lt;/span&gt;&lt;/figcaption&gt;&lt;pre data-language=&quot;bash&quot;&gt;&lt;code&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;$&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;implement&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;WP04&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;Error:&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;WP04&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;has&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;dependencies:&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; [&lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&apos;&lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#984E4D&quot;&gt;WP02&lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&apos;&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt;, &lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&apos;&lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#984E4D&quot;&gt;WP03&lt;/span&gt;&lt;span style=&quot;--0:#D9F5DD;--1:#111111&quot;&gt;&apos;&lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;]&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;Specify&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--base:&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;spec-kitty&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;implement&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;WP04&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;--base&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;WP03&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;div class=&quot;ec-line&quot;&gt;&lt;div class=&quot;code&quot;&gt;&lt;span style=&quot;--0:#82AAFF;--1:#3B61B0&quot;&gt;Then&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;manually&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;merge:&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;git&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;merge&lt;/span&gt;&lt;span style=&quot;--0:#D6DEEB;--1:#403F53&quot;&gt; &lt;/span&gt;&lt;span style=&quot;--0:#ECC48D;--1:#3B61B0&quot;&gt;010-feature-WP02&lt;/span&gt;&lt;/div&gt;&lt;/div&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/figure&gt;&lt;/div&gt;
&lt;p&gt;&lt;strong&gt;Problems:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Arbitrary choice (why WP03 over WP02?)&lt;/li&gt;
&lt;li&gt;Manual merge steps required (error-prone)&lt;/li&gt;
&lt;li&gt;No validation that all dependencies were merged&lt;/li&gt;
&lt;li&gt;Non-deterministic (two runs could create different git histories)&lt;/li&gt;
&lt;li&gt;Burdens agents with manual merge operations&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;How do we handle multi-parent dependencies deterministically and automatically?&lt;/p&gt;
&lt;h2 id=&quot;decision-drivers&quot;&gt;Decision Drivers&lt;/h2&gt;
&lt;ul&gt;
&lt;li&gt;Git limitation: can only branch from one base commit&lt;/li&gt;
&lt;li&gt;Need deterministic behavior (same inputs → same outputs)&lt;/li&gt;
&lt;li&gt;Want to eliminate manual merge steps for agents&lt;/li&gt;
&lt;li&gt;Must validate all dependencies are included&lt;/li&gt;
&lt;li&gt;Should create reproducible git history&lt;/li&gt;
&lt;li&gt;Need clear conflict detection and reporting&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;considered-options&quot;&gt;Considered Options&lt;/h2&gt;
&lt;ul&gt;
&lt;li&gt;&lt;strong&gt;Option 1:&lt;/strong&gt; Require manual —base selection and manual merge (status quo)&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Option 2:&lt;/strong&gt; Auto-merge all dependencies into temporary merge commit&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Option 3:&lt;/strong&gt; Topological-first parent selection (pick earliest dependency)&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Option 4:&lt;/strong&gt; Dependency weight-based selection (pick largest dependency)&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;decision-outcome&quot;&gt;Decision Outcome&lt;/h2&gt;
&lt;p&gt;&lt;strong&gt;Chosen option:&lt;/strong&gt; “Option 2: Auto-merge all dependencies into temporary merge commit”, because:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Fully deterministic (same deps → same git tree)&lt;/li&gt;
&lt;li&gt;No manual merge steps required&lt;/li&gt;
&lt;li&gt;Validates all dependencies merged automatically&lt;/li&gt;
&lt;li&gt;Clear error on merge conflicts&lt;/li&gt;
&lt;li&gt;Reproducible builds&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;consequences&quot;&gt;Consequences&lt;/h3&gt;
&lt;h4 id=&quot;positive&quot;&gt;Positive&lt;/h4&gt;
&lt;ul&gt;
&lt;li&gt;Fully deterministic multi-parent handling&lt;/li&gt;
&lt;li&gt;No manual merge steps for agents&lt;/li&gt;
&lt;li&gt;All dependencies validated before workspace creation&lt;/li&gt;
&lt;li&gt;Clear conflict detection and reporting&lt;/li&gt;
&lt;li&gt;Reproducible git history&lt;/li&gt;
&lt;li&gt;Eliminates arbitrary base selection&lt;/li&gt;
&lt;/ul&gt;
&lt;h4 id=&quot;negative&quot;&gt;Negative&lt;/h4&gt;
&lt;ul&gt;
&lt;li&gt;Creates additional merge commits (increases git graph complexity)&lt;/li&gt;
&lt;li&gt;Merge conflicts must be resolved before workspace creation&lt;/li&gt;
&lt;li&gt;Temporary branches persist after workspace creation&lt;/li&gt;
&lt;li&gt;Sequential merges (not octopus merge, slightly more commits)&lt;/li&gt;
&lt;/ul&gt;
&lt;h4 id=&quot;neutral&quot;&gt;Neutral&lt;/h4&gt;
&lt;ul&gt;
&lt;li&gt;Temporary merge base branch: &lt;code dir=&quot;auto&quot;&gt;###-feature-WP##-merge-base&lt;/code&gt;&lt;/li&gt;
&lt;li&gt;Dependencies sorted for deterministic merge order&lt;/li&gt;
&lt;li&gt;Merge strategy: sequential binary merges (not octopus)&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;confirmation&quot;&gt;Confirmation&lt;/h3&gt;
&lt;p&gt;We’ll validate this decision by:&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Multi-parent WPs create successfully without manual intervention&lt;/li&gt;
&lt;li&gt;Same dependencies produce same git tree hash&lt;/li&gt;
&lt;li&gt;Conflict detection catches incompatible dependencies early&lt;/li&gt;
&lt;li&gt;No reports of missing dependency code in merged workspaces&lt;/li&gt;
&lt;li&gt;Users find multi-parent workflow intuitive&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;pros-and-cons-of-the-options&quot;&gt;Pros and Cons of the Options&lt;/h2&gt;
&lt;h3 id=&quot;option-1-manual-base-selection--manual-merge&quot;&gt;Option 1: Manual —base Selection + Manual Merge&lt;/h3&gt;
&lt;p&gt;&lt;strong&gt;Pros:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Simple implementation (no auto-merge logic)&lt;/li&gt;
&lt;li&gt;User has full control over merge order&lt;/li&gt;
&lt;li&gt;Minimal git operations&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;&lt;strong&gt;Cons:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Arbitrary base selection (non-deterministic)&lt;/li&gt;
&lt;li&gt;Manual merge steps burden agents&lt;/li&gt;
&lt;li&gt;No validation of complete dependency merge&lt;/li&gt;
&lt;li&gt;Error-prone (agents may forget to merge all deps)&lt;/li&gt;
&lt;li&gt;Inconsistent git histories across runs&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;option-2-auto-merge-all-dependencies&quot;&gt;Option 2: Auto-Merge All Dependencies&lt;/h3&gt;
&lt;p&gt;&lt;strong&gt;Pros:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Fully deterministic (sorted deps → same tree)&lt;/li&gt;
&lt;li&gt;No manual steps required&lt;/li&gt;
&lt;li&gt;All dependencies validated automatically&lt;/li&gt;
&lt;li&gt;Clear conflict detection&lt;/li&gt;
&lt;li&gt;Reproducible builds&lt;/li&gt;
&lt;li&gt;Agents don’t need merge knowledge&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;&lt;strong&gt;Cons:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Additional merge commits created&lt;/li&gt;
&lt;li&gt;Conflicts block workspace creation&lt;/li&gt;
&lt;li&gt;Temporary branches persist&lt;/li&gt;
&lt;li&gt;More complex implementation&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;option-3-topological-first-parent-selection&quot;&gt;Option 3: Topological-First Parent Selection&lt;/h3&gt;
&lt;p&gt;&lt;strong&gt;Pros:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Deterministic ordering (earliest dependency)&lt;/li&gt;
&lt;li&gt;Single base branch (simpler than merge)&lt;/li&gt;
&lt;li&gt;Fewer merge commits&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;&lt;strong&gt;Cons:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Still requires manual merge of remaining deps&lt;/li&gt;
&lt;li&gt;Not all dependencies included automatically&lt;/li&gt;
&lt;li&gt;Partial solution (doesn’t eliminate manual steps)&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;option-4-dependency-weight-based-selection&quot;&gt;Option 4: Dependency Weight-Based Selection&lt;/h3&gt;
&lt;p&gt;&lt;strong&gt;Pros:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Intelligent base selection (largest impact)&lt;/li&gt;
&lt;li&gt;Potentially fewer merge conflicts&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;&lt;strong&gt;Cons:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Still requires manual merge&lt;/li&gt;
&lt;li&gt;Non-deterministic if weights equal&lt;/li&gt;
&lt;li&gt;Complex heuristic (file count? lines changed?)&lt;/li&gt;
&lt;li&gt;Doesn’t solve fundamental problem&lt;/li&gt;
&lt;/ul&gt;
&lt;h2 id=&quot;more-information&quot;&gt;More Information&lt;/h2&gt;
&lt;h3 id=&quot;implementation-summary&quot;&gt;Implementation Summary&lt;/h3&gt;
&lt;p&gt;&lt;strong&gt;Algorithm:&lt;/strong&gt;&lt;/p&gt;
&lt;ol&gt;
&lt;li&gt;Sort dependencies for deterministic ordering&lt;/li&gt;
&lt;li&gt;Create temp branch from first dependency&lt;/li&gt;
&lt;li&gt;Merge remaining dependencies sequentially&lt;/li&gt;
&lt;li&gt;Return merge commit SHA as base branch&lt;/li&gt;
&lt;/ol&gt;
&lt;p&gt;&lt;strong&gt;Temporary branch naming:&lt;/strong&gt; &lt;code dir=&quot;auto&quot;&gt;###-feature-WP##-merge-base&lt;/code&gt;&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;Conflict handling:&lt;/strong&gt;&lt;/p&gt;
&lt;ul&gt;
&lt;li&gt;Detects conflicts automatically&lt;/li&gt;
&lt;li&gt;Lists conflicting files in error message&lt;/li&gt;
&lt;li&gt;Aborts merge cleanly&lt;/li&gt;
&lt;li&gt;Cleans up temporary branch&lt;/li&gt;
&lt;/ul&gt;
&lt;p&gt;&lt;strong&gt;Test coverage:&lt;/strong&gt; 8 unit tests (merge logic, conflicts, diamond pattern) + 3 integration tests (end-to-end workflows)&lt;/p&gt;
&lt;h3 id=&quot;related-decisions&quot;&gt;Related Decisions&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;Requires &lt;a href=&quot;/adr/1.x/2026-01-23-2-explicit-base-branch-tracking/&quot;&gt;2026-01-23-2-explicit-base-branch-tracking&lt;/a&gt; for recording merge base&lt;/li&gt;
&lt;li&gt;Requires &lt;a href=&quot;/adr/1.x/2026-01-23-3-centralized-workspace-context-storage/&quot;&gt;2026-01-23-3-centralized-workspace-context-storage&lt;/a&gt; for tracking merge metadata&lt;/li&gt;
&lt;li&gt;Works with &lt;a href=&quot;/adr/1.x/2026-01-23-5-decorator-based-context-validation/&quot;&gt;2026-01-23-5-decorator-based-context-validation&lt;/a&gt; for location validation&lt;/li&gt;
&lt;/ul&gt;
&lt;h3 id=&quot;code-references&quot;&gt;Code References&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;src/specify_cli/core/multi_parent_merge.py&lt;/code&gt; - Auto-merge implementation (create_multi_parent_base function)&lt;/li&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;src/specify_cli/cli/commands/implement.py:622-789&lt;/code&gt; - Multi-parent detection and integration&lt;/li&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;tests/unit/test_multi_parent_merge.py&lt;/code&gt; - Test suite&lt;/li&gt;
&lt;li&gt;&lt;code dir=&quot;auto&quot;&gt;tests/integration/test_implement_multi_parent.py&lt;/code&gt; - End-to-end tests&lt;/li&gt;
&lt;/ul&gt;</content>
</entry>
