tor

commit 982c50401c5e9bde6a1c3ef4bf7a9019e007ab03
parent 470d8ebc61ef17a2219803f687198441866c804e
Author: David Goulet <dgoulet@torproject.org>
Date:   Fri, 12 Aug 2022 11:04:30 -0400

doc: Add git merge detail in release document

Signed-off-by: David Goulet <dgoulet@torproject.org>

Diffstat:
M
doc/HACKING/ReleasingTor.md
 | 
3
+++

1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
@@ -126,6 +126,9 @@ do the following:
    2. Merge upstream the artifacts from the `patches` job in the
       `Post-process` stage of the CI release pipeline.
 
+      Like step (2.1) above, the `-dev` version bump need to be done manually
+      with a `git merge -s ours`.
+
    3. Write and post the release announcement for the `forum.torproject.net`
       in the `News -> Tor Release Announcement` category.