fix(pulls): defer structural in-Worker merge conflicts to git and fail blocked queue entries

taigrrcommitted parent 11c931eb14a5f9a2dfa390f9214790e2c337b2bad1e1203Browse files
2 files changed+55−40

Rendering diff…