← db62cba2 Applying a branch no longer gets conflicts wrong when stacks are on mixed bases

Passed gpui-test 2m39s

raw log