Merge conflict handling for etc-merge#2286
Open
Johan-Liebert1 wants to merge 5 commits into
Open
DCO-2 / DCO
succeeded
Jul 7, 2026 in 0s
Check passed!
All commits are signed off, the check passed.
Summary
| Sha | Message | Pass or fail reason | |
|---|---|---|---|
| 🟢 | c060006 | etc-merge: Handle unmergable paths properly | Valid sign-off found |
| 🟢 | 2a630e7 | etc-merge: Introduce MergeStrategy | Valid sign-off found |
| 🟢 | 6e8199b | upgrade/switch: Accept merge_strategy cli param |
Valid sign-off found |
| 🟢 | 3219e8f | cfs/stage: Compute etc diff while staging | Valid sign-off found |
| 🟢 | d9dcd82 | tmt: Add test for etc-merge strategy | Valid sign-off found |
Loading