Skip to content

Close the gaps the first run reported in the training texts - #5

Open
PandaeDo wants to merge 1 commit into
eclipse-score:mainfrom
qorix-group:vohae_ci_feedback_run1
Open

PandaeDo wants to merge 1 commit into
eclipse-score:mainfrom
qorix-group:vohae_ci_feedback_run1

Conversation

@PandaeDo

@PandaeDo PandaeDo commented Nov 3, 2026

Copy link
Copy Markdown
Contributor

The Qorix version of this training had its first run with five participants in October 2026. Their continuous improvement feedback applies here too, so this brings the same fixes upstream.

Feedback Fix
#R4 already conflicts with main before task 5.3. Three of five participants had picked its id instruction line as the self-found typo in 1.3, or aligned it in their #R1 fix 1.2-1.3 and 4.1: leave the .. attention:: blocks alone until stage 5. 5.3: what to do if #R4 conflicts anyway. SOLUTIONS.md records the trap
Merging the fix pull request first lets GitHub mark the prepared pull request as merged, and a merged pull request cannot be closed 4.1, 4.2, 6.1: close the prepared pull request first
Rule 3 ("the commit carries the reasoning") is supported by nothing .gitmessage commit template, set up in "Set up your copy". No enforcing hook
What valid means on a branch is unclear (templates: "set to valid"; documentation guideline: valid once reviewed) TRAINING.md states it once: the status takes effect when the pull request is approved and merged. This is the reading the solution key already uses, and the one the requirements concept states for requirements
No git commands in 1.1 and 2.2-2.4; a stale local main Commands named; 2.4 says to pull main before building it; Pro Git pointer for rebasing
"Record the need id" was read as "create a need" 3.1 shows the :need: syntax; 3.1 and 3.2 say no need is created
No rule for deciding what to keep from a predecessor's text 5.4: every statement needs a source (template, process, standard, decision record)

Checked: every text replacement matched exactly once. render_issue from training/setup.py renders all 15 task files with no {{…}} left. pre-commit run on the changed files passes.

Small change (34 lines added, 12 removed), so no IP review is needed. .gitmessage carries the AI disclosure header like the other generated files.

🤖 Generated with Claude Code. Assisted-by: Claude Code (claude-opus-5-5); reviewed by the author.

The Qorix version of this training had its first run in October 2026. The
participants' continuous improvement feedback applies here too:

- #R4 conflicted with main before task 5.3: participants picked its id
  instruction line as the self-found typo in 1.3, or aligned it in their #R1
  fix. 1.2-1.3 and 4.1 now say to leave the attention blocks alone until
  stage 5; 5.3 says what to do if #R4 conflicts anyway. SOLUTIONS.md records
  the trap.
- Merging the fix first lets GitHub mark the prepared pull request as
  merged, and a merged pull request cannot be closed. 4.1, 4.2 and 6.1 now
  say to close it first.
- Rule 3 was supported by nothing. A commit message template, .gitmessage,
  set up in "Set up your copy", asks for the reason and a Checked: line.
- What valid means on a branch was unclear. TRAINING.md states it once, as
  the solution key already reads it (#R2 defect 5, #R5) and as the S-CORE
  requirements concept says it for requirements.
- 1.1 and 2.2-2.4 name the git commands and say to pull main before building
  it; "When something breaks" points to Pro Git for rebasing.
- 3.1 shows the :need: syntax, and 3.1 and 3.2 say no need is created.
- 5.4 gives the rule for a predecessor's text: every statement needs a
  source.

Checked: every text replacement matched exactly once; render_issue from
training/setup.py renders all 15 task files with no {{...}} left;
pre-commit run on the changed files passes.

Assisted-by: Claude Code (claude-opus-5-5)
Comment thread training/SOLUTIONS.md
Re-checked 2026-10-29 on `4dc60d8` with `main` + r1, r2, r3, r5-security, then r4: the same
three conflicts.

What the simulations missed, found in the first run of the Qorix version of this training

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Qorix is part here, so should it be not contributor neutral here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants