chore(releasing): update patch release template with extra step details

Author: neuronull

.github/ISSUE_TEMPLATE/patch-release.md

@@ -10,6 +10,7 @@ Before the release:
 - [ ] Create a new release preparation branch from the current release branch
   - `git fetch && git checkout v0.<current minor version> && git checkout -b prepare-v0.<new version number>`
 - [ ] Cherry-pick in all commits to be released from the associated release milestone
+  - If any merge conflicts occur, attempt to solve them and if needed enlist the aid of those familiar with the conflicting commits.
 - [ ] Run `cargo vdev build release-cue` to generate a new cue file for the release
 - [ ] Add `changelog` key to generated cue file
   - [ ] `git log --no-merges --cherry-pick --right-only <last release tag>...`
@@ -29,20 +30,24 @@ Before the release:
 
 On the day of release:
 
+- [ ] Ensure release date in cue matches current date.
 - [ ] Rebase the release preparation branch on the release branch
-    - [ ] Ensure release date in cue matches current date.
-    - [ ] Squash the release preparation commits (but not the cherry-picked commits!) to a single
-        commit. This makes it easier to cherry-pick to master after the release. 
+  - Squash the release preparation commits (but not the cherry-picked commits!) to a single
+    commit. This makes it easier to cherry-pick to master after the release.
+  - `git checkout prepare-v0.<new version number> && git rebase -i v0.<current minor version>`
 - [ ] Merge release preparation branch into the release branch
-    - `git co v0.<current minor version> && git merge --ff-only prepare-v0.<current minor version>.<patch>`
+  - `git co v0.<current minor version> && git merge --ff-only prepare-v0.<current minor version>.<patch>`
 - [ ] Tag new release
   - [ ] `git tag v0.<minor>.<patch> -a -m v0.<minor>.<patch>`
   - [ ] `git push origin v0.<minor>.<patch>`
 - [ ] Wait for release workflow to complete
   - Discoverable via [https://github.com/timberio/vector/actions/workflows/release.yml](https://github.com/timberio/vector/actions/workflows/release.yml)
+- [ ] Push the release branch to update the remote (This should close the preparation branch PR).
+  - `git checkout v0.<current minor version> && git push`
 - [ ] Release updated Helm chart. See [releasing Helm chart](https://github.com/vectordotdev/helm-charts#releasing).
 - [ ] Once Helm chart is released, updated Vector manifests
-    - Run `cargo vdev build manifests` and open a PR with changes
+  - Run `cargo vdev build manifests` and open a PR with changes
 - [ ] Add docker images to [https://github.com/DataDog/images](https://github.com/DataDog/images/tree/master/vector) to have them available internally.
+  - Follow the [instructions at the top of the mirror.yaml file](https://github.com/DataDog/images/blob/fbf12868e90d52e513ebca0389610dea8a3c7e1a/mirror.yaml#L33-L49).
 - [ ] Cherry-pick any release commits from the release branch that are not on `master`, to `master`
 - [ ] Kick-off post-mortems for any regressions resolved by the release