fix(engine): tell a merge pre-flight refusal from a conflict, and stop escalating over dirt the merge cannot commit (#618, #619, #623) - #685

fix(engine): tell a merge pre-flight refusal from a conflict, and stop escalating over dirt the merge cannot commit (#618, #619, #623)#685

pbean merged 26 commits into

mainbmad-code-org/bmad-loop:mainfrom

pbean/merge-preflight-taxonomybmad-code-org/bmad-loop:pbean/merge-preflight-taxonomyCopy head branch name to clipboard