← 5744bf86 `but resolve` finds conflicted commits on worktree branches

Passed prettier 10s

raw log