Skip to content

Commit 1be02ff

Browse files
committed
update maintainers.md
1 parent bf6960a commit 1be02ff

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

docs/maintainers.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,18 @@ When we are considering publishing a new release, all of the following steps mus
4646
* Merge after approval
4747

4848
### Post-Merge to `main` branch:
49-
50-
1. Create annotated git tag for the release
51-
* [HowTo](https://git-scm.com/book/en/v2/Git-Basics-Tagging#Annotated-Tags)
5249

5350
1. Draft a [new release](https://github.com/netascode/ansible-dc-vxlan/releases) on GitHub
5451

55-
1. Merge `main` branch back into `develop` branch
52+
1. Merge `release branch` branch back into `main` branch
5653
* Resolve any merge conflicts
5754
* Optional: Delete release branch (May want to keep for reference)
55+
* Merge `release branch` into `main` as `squash and merge`
56+
57+
1. Investigating. Merge `main` branch back into `develop` branch
58+
59+
1. Create annotated git tag for the release
60+
* [HowTo](https://git-scm.com/book/en/v2/Git-Basics-Tagging#Annotated-Tags)
5861

5962
### Publish Release to Ansible Galaxy:
6063

0 commit comments

Comments
 (0)