Merge pull request #21 from TEIC/temp_for_patch_release_4.10.1

move a few steps

Author: martindholmes

TCW/tcw22.xml

@@ -20,8 +20,7 @@
 	     intellectual responsibility, rather than as an actual
 	     editor. —Syd, 2021-04-16 -->
 	<editor xml:id="SDB">Syd Bauman</editor>
-      <editor xml:id="POC">Patricia O Connor</editor>
-        <!-- Note: I'm listing myself as an editor solely because I added a change to update the document -->
+	<editor xml:id="POC">Patricia O Connor</editor>
       </titleStmt>
       <publicationStmt>
         <publisher>TEI Technical Council</publisher>
@@ -33,6 +32,7 @@
       </sourceDesc>
     </fileDesc>
     <revisionDesc>
+      <change when="2025-08-27" who="#SDB">Per HBS, move “merge into "released"” steps up to immediately after the push into the "release-X.X.X" step.</change>
       <change when="2025-03-31" who="#POC">Revised and updated procedure as some checking steps are currently listed after the released branch is created. Moved steps 6 and 7 to after step 14.</change>
       <change when="2025-01-22" who="#RV">Removed any mentions of Jenkins 3, now defunct.</change>
       <change when="2024-11-02" who="#EBB">Clarified where to check on the Vault for the current releases of Stylesheets and Guidelines needed for building the oXygen plugin. 
@@ -308,6 +308,29 @@
 	    the Stylesheets build may fail after the TEI release is complete, so it is better to wait
 	    until the TEI release is complete before doing the Stylesheets release. (Council is considering 
 	    changing how the dependency is managed).</item>
+
+            <item>
+	      <hi rend="bold">Merge the release branch into <code>dev</code> and <code>released</code></hi>.
+              <list type="ordered">
+		<item><code>git checkout released</code></item>
+		<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
+		<item><code>git checkout dev</code></item>
+		<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
+		<item>and don’t forget to <code>git checkout released</code></item>
+	      </list>
+	    </item>
+            
+            <item>
+	      <hi rend="bold">Repeat the steps above for the Stylesheets</hi>:
+              <list type="ordered">
+		<item><code>git checkout released</code></item>
+		<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
+		<item><code>git checkout dev</code></item>
+		<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
+		<item>and don’t forget to <code>git checkout released</code></item>
+	      </list>
+            </item>
+          
           <item><hi rend="bold">Ensure all changes have been committed, built, and successfully
               passed tests on the continuous integration server</hi><lb/> When all builds have
             completed on all Jenkins servers, click on the job number of the last build for each of the
@@ -381,19 +404,6 @@
             log in, and click the information button on your new release. Make it the default download for all
             operating systems. Now make sure that the main Download button links to your package. </item>
 
-          <item><hi rend="bold">Merge the release branch into <code>released</code></hi>.  <lb/>
-            <code>git checkout released</code><lb/>
-            <code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
-          
-          <item><hi rend="bold">Repeat the steps above for the Stylesheets</hi>:
-            <list type="ordered">
-              <item>Merge the release branch into <code>released</code><lb/>
-                <code>git checkout released</code><lb/>
-                <code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code>
-              </item>
-            </list>
-          </item>
-          
           <item>
             <hi rend="bold">Update tags on GitHub</hi><lb/> Every time a new release is made, a
             "tag" is created consisting of a pointer to the state of the P5 tree at release time.