podcast: fix stale Chapter 6.1/7.1 dialogue references to match the real challenge mechanics

The Chapter 6 and Chapter 7 podcast dialogue still described the old,
never-shipped design: a separate "Chapter 6.1" issue for the branch-prep
exercise, and a "Chapter 7.1: Resolve Conflict Markers" issue pointing at a
static practice file. Neither exists - real issue titles are always
"Challenge N: name," and Challenge 7 now auto-opens a practice PR with a
real conflict (this session's earlier fix). Corrected the source script and
transcript segments for both chapters, then hand-patched the same six
already-generated lines in admin/PODCASTS.md and podcasts/feed.xml rather
than regenerating those files wholesale - a full `node
podcasts/generate-site.js` run in this environment produces a stale
16-episode feed still referencing the removed GitHub Classroom flow, since
this checkout doesn't have the fuller pipeline output that produced the
current 79-episode feed. Left podcasts/logs/agentic-pilots/*.packet.json
untouched - those are point-in-time historical snapshots, not living docs.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: GitHub Workshop Bot

admin/PODCASTS.md

@@ -4545,8 +4545,8 @@ Based on: [Chapter 6: Working with Pull Requests](../docs/06-working-with-pull-r
 </p>
 <hr />
 <p><strong>Alex:</strong> In the chapter practice, the first mini challenge is intentionally small: create one
-  branch change. You open your assigned Chapter 6.1 issue in the Learning Room, go to the
-  file it names, and make only the requested edit.
+  branch change. This is prep work for Challenge 6, not a separate issue - you just pick one
+  of the three practice files in the Learning Room and make one focused edit.
 </p>
 <p><strong>Jamie:</strong> Those files are things like the welcome document, the keyboard shortcuts reference, and
   the setup guide, right?
@@ -5653,9 +5653,9 @@ Based on: [Chapter 7: Merge Conflicts Are Not Scary](../docs/07-merge-conflicts.
 <p><strong>Jamie:</strong> I like that it is controlled. You are not being dropped into a huge open source conflict
   with ten files and a blinking cursor.
 </p>
-<p><strong>Alex:</strong> Exactly. You open your assigned Chapter 7 challenge issue, the one titled something like
-  &quot;Chapter 7.1: Resolve Conflict Markers (@yourname).&quot; The issue tells you which
-  practice file contains the markers.
+<p><strong>Alex:</strong> Exactly. You open your Challenge 7 issue - titled &quot;Challenge 7: Survive a Merge
+  Conflict&quot; - and opening it automatically opens a practice pull request in your repository
+  with a real conflict already showing in docs/welcome.md.
 </p>
 <p><strong>Jamie:</strong> Then the first practical move is to search for &lt;&lt;&lt;&lt;&lt;&lt;&lt;, right?
 </p>

podcasts/feed.xml

@@ -7371,7 +7371,7 @@ Jamie: For anything that changes over time, check GitHub's current document
 <p><strong>Jamie:</strong> That is a small thing, but it can save a lot of confusion. Reading mode for reading, typing mode for typing.</p>
 <p><strong>Alex:</strong> Yes. Also maximize the browser window if you can. GitHub&apos;s landmarks and panels are more predictable when the layout is not squeezed.</p>
 <hr />
-<p><strong>Alex:</strong> In the chapter practice, the first mini challenge is intentionally small: create one branch change. You open your assigned Chapter 6.1 issue in the Learning Room, go to the file it names, and make only the requested edit.</p>
+<p><strong>Alex:</strong> In the chapter practice, the first mini challenge is intentionally small: create one branch change. This is prep work for Challenge 6, not a separate issue - you just pick one of the three practice files in the Learning Room and make one focused edit.</p>
 <p><strong>Jamie:</strong> Those files are things like the welcome document, the keyboard shortcuts reference, and the setup guide, right?</p>
 <p><strong>Alex:</strong> Yes. One issue might ask you to replace a TODO in docs/welcome.md. Another might ask you to fix an incorrect shortcut in docs/keyboard-shortcuts.md, or repair a broken link in docs/setup-guide.md. From the web editor, you activate &quot;Edit this file,&quot; make the focused change, and then use &quot;Commit changes&quot; to create a new branch such as fix/yourname-issue42.</p>
 <p><strong>Jamie:</strong> And the branch is short-lived on purpose. It keeps this one fix separate from main and separate from other workshop work.</p>
@@ -7482,7 +7482,7 @@ Yes. Also maximize the browser window if you can. GitHub's landmarks and panels
 [PAUSE]
 
 [ALEX]
-In the chapter practice, the first mini challenge is intentionally small: create one branch change. You open your assigned Chapter 6.1 issue in the Learning Room, go to the file it names, and make only the requested edit.
+In the chapter practice, the first mini challenge is intentionally small: create one branch change. This is prep work for Challenge 6, not a separate issue - you just pick one of the three practice files in the Learning Room and make one focused edit.
 
 [JAMIE]
 Those files are things like the welcome document, the keyboard shortcuts reference, and the setup guide, right?
@@ -7717,7 +7717,7 @@ Jamie: That is a small thing, but it can save a lot of confusion. Reading mode f
 
 Alex: Yes. Also maximize the browser window if you can. GitHub&apos;s landmarks and panels are more predictable when the layout is not squeezed.
 
-Alex: In the chapter practice, the first mini challenge is intentionally small: create one branch change. You open your assigned Chapter 6.1 issue in the Learning Room, go to the file it names, and make only the requested edit.
+Alex: In the chapter practice, the first mini challenge is intentionally small: create one branch change. This is prep work for Challenge 6, not a separate issue - you just pick one of the three practice files in the Learning Room and make one focused edit.
 
 Jamie: Those files are things like the welcome document, the keyboard shortcuts reference, and the setup guide, right?
 
@@ -9252,7 +9252,7 @@ Alex: It is. The first pull request is where GitHub starts to feel less like a w
 <hr />
 <p><strong>Alex:</strong> In Challenge 07, the Day 1 stretch challenge called Survive a Merge Conflict, you practice this in a safe file inside your Learning Room repository. That Learning Room repo is provisioned for you, and it is where the Day 1 issue, branch, commit, pull request, and merge workflow happens.</p>
 <p><strong>Jamie:</strong> I like that it is controlled. You are not being dropped into a huge open source conflict with ten files and a blinking cursor.</p>
-<p><strong>Alex:</strong> Exactly. You open your assigned Chapter 7 challenge issue, the one titled something like &quot;Chapter 7.1: Resolve Conflict Markers (@yourname).&quot; The issue tells you which practice file contains the markers.</p>
+<p><strong>Alex:</strong> Exactly. You open your Challenge 7 issue - titled &quot;Challenge 7: Survive a Merge Conflict&quot; - and opening it automatically opens a practice pull request in your repository with a real conflict already showing in docs/welcome.md.</p>
 <p><strong>Jamie:</strong> Then the first practical move is to search for &lt;&lt;&lt;&lt;&lt;&lt;&lt;, right?</p>
 <p><strong>Alex:</strong> Yes. Use the find command so you can jump straight to it. The chapter suggests Ctrl+F in the browser, and in VS Code you can use its search or find tools; the important part is that these markers are plain text and screen readers can read them.</p>
 <p><strong>Jamie:</strong> Once I find the block, I read the current branch side, read the incoming side, choose or combine content, delete the marker lines, and search again to make sure nothing remains.</p>
@@ -9373,7 +9373,7 @@ In Challenge 07, the Day 1 stretch challenge called Survive a Merge Conflict, yo
 I like that it is controlled. You are not being dropped into a huge open source conflict with ten files and a blinking cursor.
 
 [ALEX]
-Exactly. You open your assigned Chapter 7 challenge issue, the one titled something like "Chapter 7.1: Resolve Conflict Markers (@yourname)." The issue tells you which practice file contains the markers.
+Exactly. You open your Challenge 7 issue - titled "Challenge 7: Survive a Merge Conflict" - and opening it automatically opens a practice pull request in your repository with a real conflict already showing in docs/welcome.md.
 
 [JAMIE]
 Then the first practical move is to search for <<<<<<<, right?
@@ -9570,7 +9570,7 @@ Alex: In Challenge 07, the Day 1 stretch challenge called Survive a Merge Confli
 
 Jamie: I like that it is controlled. You are not being dropped into a huge open source conflict with ten files and a blinking cursor.
 
-Alex: Exactly. You open your assigned Chapter 7 challenge issue, the one titled something like &quot;Chapter 7.1: Resolve Conflict Markers (@yourname).&quot; The issue tells you which practice file contains the markers.
+Alex: Exactly. You open your Challenge 7 issue - titled &quot;Challenge 7: Survive a Merge Conflict&quot; - and opening it automatically opens a practice pull request in your repository with a real conflict already showing in docs/welcome.md.
 
 Jamie: Then the first practical move is to search for &lt;&lt;&lt;&lt;&lt;&lt;&lt;, right?
 

podcasts/scripts/chapters/ch-06-working-with-pull-requests.txt

@@ -36,7 +36,7 @@ Yes. Also maximize the browser window if you can. GitHub's landmarks and panels
 [PAUSE]
 
 [ALEX]
-In the chapter practice, the first mini challenge is intentionally small: create one branch change. You open your assigned Chapter 6.1 issue in the Learning Room, go to the file it names, and make only the requested edit.
+In the chapter practice, the first mini challenge is intentionally small: create one branch change. This is prep work for Challenge 6, not a separate issue - you just pick one of the three practice files in the Learning Room and make one focused edit.
 
 [JAMIE]
 Those files are things like the welcome document, the keyboard shortcuts reference, and the setup guide, right?

podcasts/scripts/chapters/ch-07-merge-conflicts.txt

@@ -65,7 +65,7 @@ In Challenge 07, the Day 1 stretch challenge called Survive a Merge Conflict, yo
 I like that it is controlled. You are not being dropped into a huge open source conflict with ten files and a blinking cursor.
 
 [ALEX]
-Exactly. You open your assigned Chapter 7 challenge issue, the one titled something like "Chapter 7.1: Resolve Conflict Markers (@yourname)." The issue tells you which practice file contains the markers.
+Exactly. You open your Challenge 7 issue - titled "Challenge 7: Survive a Merge Conflict" - and opening it automatically opens a practice pull request in your repository with a real conflict already showing in docs/welcome.md.
 
 [JAMIE]
 Then the first practical move is to search for <<<<<<<, right?

podcasts/transcripts/chapters/ch-06-working-with-pull-requests-segments.json

@@ -53,7 +53,7 @@
   },
   {
     "speaker": "ALEX",
-    "text": "In the chapter practice, the first mini challenge is intentionally small: create one branch change. You open your assigned Chapter 6.1 issue in the Learning Room, go to the file it names, and make only the requested edit."
+    "text": "In the chapter practice, the first mini challenge is intentionally small: create one branch change. This is prep work for Challenge 6, not a separate issue - you just pick one of the three practice files in the Learning Room and make one focused edit."
   },
   {
     "speaker": "JAMIE",

podcasts/transcripts/chapters/ch-07-merge-conflicts-segments.json

@@ -93,7 +93,7 @@
   },
   {
     "speaker": "ALEX",
-    "text": "Exactly. You open your assigned Chapter 7 challenge issue, the one titled something like \"Chapter 7.1: Resolve Conflict Markers (@yourname).\" The issue tells you which practice file contains the markers."
+    "text": "Exactly. You open your Challenge 7 issue - titled \"Challenge 7: Survive a Merge Conflict\" - and opening it automatically opens a practice pull request in your repository with a real conflict already showing in docs/welcome.md."
   },
   {
     "speaker": "JAMIE",