[tor-commits] [tor] branch main updated: doc: Add git merge detail in release document

[gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main
in repository tor.

The following commit(s) were added to refs/heads/main by this push:
     new 982c50401c doc: Add git merge detail in release document
982c50401c is described below

commit 982c50401c5e9bde6a1c3ef4bf7a9019e007ab03
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
AuthorDate: Fri Aug 12 11:04:30 2022 -0400

    doc: Add git merge detail in release document
    
    Signed-off-by: David Goulet <dgoulet@xxxxxxxxxxxxxx>
---
 doc/HACKING/ReleasingTor.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
index 0f26cb5881..6422d84891 100644
--- 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.
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits