Deployed 21ece11 with MkDocs version: 1.6.1

contributing/cherry-picking/index.html

@@ -603,6 +603,17 @@
 
 
 
+        <label class="md-nav__link md-nav__link--active" for="__toc">
+
+
+  <span class="md-ellipsis">
+    Getting your PR into a stable branch
+  </span>
+
+
+          <span class="md-nav__icon md-icon"></span>
+        </label>
+
       <a href="./" class="md-nav__link md-nav__link--active">
 
 
@@ -613,6 +624,43 @@
 
       </a>
 
+
+
+<nav class="md-nav md-nav--secondary" aria-label="Table of contents">
+
+
+
+
+
+
+    <label class="md-nav__title" for="__toc">
+      <span class="md-nav__icon md-icon"></span>
+      Table of contents
+    </label>
+    <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
+
+        <li class="md-nav__item">
+  <a href="#method-1" class="md-nav__link">
+    <span class="md-ellipsis">
+      Method 1
+    </span>
+  </a>
+
+</li>
+
+        <li class="md-nav__item">
+  <a href="#method-2" class="md-nav__link">
+    <span class="md-ellipsis">
+      Method 2
+    </span>
+  </a>
+
+</li>
+
+    </ul>
+
+</nav>
+
     </li>
 
 
@@ -645,6 +693,32 @@
 
 
 
+    <label class="md-nav__title" for="__toc">
+      <span class="md-nav__icon md-icon"></span>
+      Table of contents
+    </label>
+    <ul class="md-nav__list" data-md-component="toc" data-md-scrollfix>
+
+        <li class="md-nav__item">
+  <a href="#method-1" class="md-nav__link">
+    <span class="md-ellipsis">
+      Method 1
+    </span>
+  </a>
+
+</li>
+
+        <li class="md-nav__item">
+  <a href="#method-2" class="md-nav__link">
+    <span class="md-ellipsis">
+      Method 2
+    </span>
+  </a>
+
+</li>
+
+    </ul>
+
 </nav>
                   </div>
                 </div>
@@ -674,7 +748,20 @@ <h1 id="getting-your-pr-into-a-stable-branch">Getting your PR into a stable bran
 cherry pick.</p>
 <p>Please do not ask <a href="../../OWNERS">core maintainers</a> to cherry pick your
 patch though we will be happy to review it and help merge it once the
-cherry pick PR has been submitted.</p>
+cherry pick PR has been submitted using one of the methods below.</p>
+<h2 id="method-1">Method 1<a class="headerlink" href="#method-1" title="Permanent link">#</a></h2>
+<p>Add a comment like the following to the PR you wish to cherry pick.
+<div class="highlight"><pre><span></span><code>/cherrypick 18.0.0-proposed
+</code></pre></div>
+The <a href="https://github.com/openshift-cherrypick-robot">openshift-cherrypick-robot</a>
+will then attempt to create a new PR of the original PR (after it
+merges) with a cherry-pick of the same patch into the desired branch.
+There are
+<a href="https://github.com/openstack-k8s-operators/architecture/pull/395#issuecomment-2352668300">examples</a>
+of this in previous PRs in this repository.</p>
+<p>If there is a <a href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line">merge conflict</a>,
+then method 1 will not work and you will need to use method 2.</p>
+<h2 id="method-2">Method 2<a class="headerlink" href="#method-2" title="Permanent link">#</a></h2>
 <p>If you can send a PR to this repository then you can create a cherry
 pick using the <code>git</code> command line tools without requiring any
 additional privileges. For example, the following produces a
@@ -710,7 +797,7 @@ <h1 id="getting-your-pr-into-a-stable-branch">Getting your PR into a stable bran
     <span class="md-icon" title="Last update">
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M21 13.1c-.1 0-.3.1-.4.2l-1 1 2.1 2.1 1-1c.2-.2.2-.6 0-.8l-1.3-1.3c-.1-.1-.2-.2-.4-.2m-1.9 1.8-6.1 6V23h2.1l6.1-6.1zM12.5 7v5.2l4 2.4-1 1L11 13V7zM11 21.9c-5.1-.5-9-4.8-9-9.9C2 6.5 6.5 2 12 2c5.3 0 9.6 4.1 10 9.3-.3-.1-.6-.2-1-.2s-.7.1-1 .2C19.6 7.2 16.2 4 12 4c-4.4 0-8 3.6-8 8 0 4.1 3.1 7.5 7.1 7.9l-.1.2z"/></svg>
     </span>
-    2024-08-06
+    2024-09-16
   </span>