Skip to content

Etc merge changes#2301

Open
Johan-Liebert1 wants to merge 3 commits into
bootc-dev:mainfrom
Johan-Liebert1:etc-merge-changes
Open

Etc merge changes#2301
Johan-Liebert1 wants to merge 3 commits into
bootc-dev:mainfrom
Johan-Liebert1:etc-merge-changes

tmt: Add tests for etc merge conflict

437433e
Select commit
Loading
Failed to load commit list.
DCO-2 / DCO succeeded Jul 14, 2026 in 0s

Check passed!

All commits are signed off, the check passed.

Summary


Sha Message Pass or fail reason
🟢 70afb4a etc-merge: Handle unmergable paths properly Valid sign-off found
🟢 94b6630 cfs/stage: Compute etc diff before staging Valid sign-off found
🟢 437433e tmt: Add tests for etc merge conflict Valid sign-off found