Skip to content

Commit eaf32e9

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

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

docs/maintainers.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,19 @@ When we are considering publishing a new release, all of the following steps mus
4141
* 0.x.0 - new feature(s)
4242
* x.0.0 - backward-incompatible change (if unvoidable!)
4343

44-
1. Open pull request from release branch against the `main` branch.
44+
1. Open pull request from release branch against the `main` branch
4545
* Ensure all GitHub Actions tasks have passed
46-
* Merge after approval
46+
* Merge `release branch` into `main` after approval as `squash and merge`
4747

4848
### Post-Merge to `main` branch:
49-
50-
1. Draft a [new release](https://github.com/netascode/ansible-dc-vxlan/releases) on GitHub
51-
52-
1. Merge `release branch` branch back into `main` branch
53-
* Resolve any merge conflicts
54-
* 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
5849

5950
1. Create annotated git tag for the release
6051
* [HowTo](https://git-scm.com/book/en/v2/Git-Basics-Tagging#Annotated-Tags)
6152

53+
1. Draft a [new release](https://github.com/netascode/ansible-dc-vxlan/releases) on GitHub
54+
55+
1. Investigating. Merge `main` branch back into `develop` branch
56+
6257
### Publish Release to Ansible Galaxy:
6358

6459
1. Publish to Ansible Galaxy

0 commit comments

Comments
 (0)