Skip to content

Commit c4e766b

Browse files
committed
Add steps to pull before merge (probably not necessary, but can’t hurt)
1 parent df1a69b commit c4e766b

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

TCW/tcw22.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,13 @@
312312
<item>
313313
<hi rend="bold">Merge the release branch into <code>dev</code> and <code>released</code></hi>.
314314
<list type="ordered">
315+
<item><code>git checkout release-X.X.X</code></item>
316+
<item><code>git pull</code></item>
315317
<item><code>git checkout released</code></item>
318+
<item><code>git pull</code></item>
316319
<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
317320
<item><code>git checkout dev</code></item>
321+
<item><code>git pull</code></item>
318322
<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
319323
<item>and don’t forget to <code>git checkout released</code></item>
320324
</list>
@@ -323,9 +327,13 @@
323327
<item>
324328
<hi rend="bold">Repeat the steps above for the Stylesheets</hi>:
325329
<list type="ordered">
330+
<item><code>git checkout release-X.X.X</code></item>
331+
<item><code>git pull</code></item>
326332
<item><code>git checkout released</code></item>
333+
<item><code>git pull</code></item>
327334
<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
328335
<item><code>git checkout dev</code></item>
336+
<item><code>git pull</code></item>
329337
<item><code>git merge --no-ff -m "YOUR COMMIT MESSAGE" release-X.X.X</code></item>
330338
<item>and don’t forget to <code>git checkout released</code></item>
331339
</list>

0 commit comments

Comments
 (0)