File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 6262 echo 'main integrated cleanly.'
6363 else
6464 echo 'Automatic merge reported conflicts. Applying publication-branch ownership to generated/RTL infrastructure files.'
65- git checkout --ours -- .github/workflows/build-book.yml tools/create_reference_docx.py PUBLISH/CHAPTERS/01-foundations/01-foundations.docx PUBLISH/CHAPTERS/01-foundations/01-foundations.pdf
66- git add .github/workflows/build-book.yml tools/create_reference_docx.py PUBLISH/CHAPTERS/01-foundations/01-foundations.docx PUBLISH/CHAPTERS/01-foundations/01-foundations.pdf
65+ git checkout --ours -- .github/workflows/build-book.yml tools/create_reference_docx.py tools/finalize_docx_rtl.py tools/render_book.py PUBLISH/CHAPTERS/01-foundations/01-foundations.docx PUBLISH/CHAPTERS/01-foundations/01-foundations.pdf
66+ git add .github/workflows/build-book.yml tools/create_reference_docx.py tools/finalize_docx_rtl.py tools/render_book.py PUBLISH/CHAPTERS/01-foundations/01-foundations.docx PUBLISH/CHAPTERS/01-foundations/01-foundations.pdf
6767 if git diff --name-only --diff-filter=U | grep -q .; then
6868 echo 'CONFLICT: unresolved files remain after deterministic resolution.'
6969 git status --short
8888 - name : Render DOCX and PDF chapter files
8989 run : python tools/render_book.py
9090
91- - name : Generate publication QA report
92- run : python tools/validate_publication .py
91+ - name : Generate final publication QA
92+ run : python tools/validate_publication_final .py
9393
9494 - name : Generate visual PDF layout QA
9595 run : python tools/validate_visual_layout.py
You can’t perform that action at this time.
0 commit comments