- Added a conflict-markers guard that makes /ship refuse pushes containing leftover merge conflict markers in the commit being pushed and in the working tree. behavior changed · inferred, marked in the notes below
- The conflict-markers guard refuses lines starting with `<<<<<<<` or `>>>>>>>` or lines exactly equal to `=======`, even inside template literals that still parse and pass tests.
- Files can declare a `gstack-conflict-markers: fixture` line near the top to intentionally show conflict markers without triggering the guard.
- The conflict-markers guard skips Markdown code blocks with an unlabeled, `text` or `diff` fence that show git output, while still refusing conflicts inside `bash` or `ts` fences.
1 change to check, marked in the notes below
From gstack
Pushes from /ship now stop on leftover merge conflict markers.
A new conflict-markers guard reads every line the branch adds, in the commit being pushed and in the working tree, and refuses one that starts with <<<<<<< or >>>>>>>, or is exactly =======, even inside a template literal that still parses and passes its tests (GST-1190, seen on #3927).
Markdown code blocks that show git output (an unlabeled, text or diff fence) are skipped, while a conflict inside a bash or ts fence is still refused.
A fixture that shows markers on purpose declares gstack-conflict-markers: fixture on a line of its own near the top.
test/conflict-markers.test.ts: a marker inside a template literal is refused; a Markdown code block that shows a marker passes while the same lines outside a fence or in a bash fence are refused; unchanged lines, declared fixtures, untracked files, quoted file names, git prefix settings and a committed conflict hidden by an unstaged repair are handled. behavior changed · inferred