Skip to content

[TEST] Unresolvable reorg conflict (base edited the same line) (not auto-fixable) - #38266

Closed
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-unresolvable-reorg-3fdce8fc
Closed

[TEST] Unresolvable reorg conflict (base edited the same line) (not auto-fixable)#38266
jhgilbert wants to merge 1 commit into
mock-reorged-master-7-17-843-conflict-781218c1from
jen.gilbert/astro-reorg-test-unresolvable-reorg-3fdce8fc

Test PR: edit a line the reorged base also changed

a9db0b1
Select commit
Loading
Failed to load commit list.

There are no checks for this commit