This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/plc4x-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 06e5bdc Site checkin for project PLC4X: Jenkins Tools
06e5bdc is described below
commit 06e5bdcd6b16494c219bd564d9aea66e5889e5d3
Author: jenkins <[email protected]>
AuthorDate: Mon Jan 25 20:18:16 2021 +0000
Site checkin for project PLC4X: Jenkins Tools
---
developers/release/release.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/developers/release/release.html b/developers/release/release.html
index f0b4d97..74eff2c 100644
--- a/developers/release/release.html
+++ b/developers/release/release.html
@@ -449,7 +449,7 @@ Usually the <code>NOTICE</code> file has to be adjusted.</p>
<p>For each new Major and Minor release we create a new branch at the
beginning of a code-freeze phase.</p>
</div>
<div class="paragraph">
-<p>So if currently the project version in develop is
<code>0.9.0-SNAPSHOT</code>, we create a branch <code>release/0.9</code>.</p>
+<p>So if currently the project version in develop is
<code>0.9.0-SNAPSHOT</code>, we create a branch <code>rel/0.9</code>.</p>
</div>
<div class="paragraph">
<p>When creating the branch is exactly the moment in which the version in
<code>develop</code> is incremented to the next minor version.</p>
@@ -969,7 +969,7 @@ This has to be done with git</p>
<div class="listingblock">
<div class="content">
<pre>git checkout release
-git merge release/0.9.0</pre>
+git merge v0.9.0</pre>
</div>
</div>
<div class="paragraph">
@@ -977,7 +977,7 @@ git merge release/0.9.0</pre>
</div>
<div class="listingblock">
<div class="content">
-<pre>git merge -X theirs release/0.9.0</pre>
+<pre>git merge -X theirs v0.9.0</pre>
</div>
</div>
<div class="paragraph">
