Skip to content

Commit 977a079

Browse files
committed
Clarify need for merging into dev before merging into released
1 parent dfb334e commit 977a079

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

TCW/tcw22.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
<item>Edit the Stylesheets/VERSION number to the correct release number (usually just
282282
remove the 'a').</item>
283283
<item>Run <code>make log</code> to generate the changelog. Then commit the changes.</item>
284-
<!-- Need to update here to include merge the release branch into dev -->
284+
<!-- Need to update here to include a step to merge the release branch into dev before proceeding to merge the release branch into the released branch -->
285285
<item>Merge the release branch into <code>released</code><lb/>
286286
<code>git checkout released</code><lb/>
287287
<code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code>

0 commit comments

Comments
 (0)