1- # Contributing
1+ # Contributing Guidelines
22
3- The project team welcomes contributions from the community . Whether it is a bug report, an
4- enhancement request, or documentation update , we greatly value feedback and contributions from our
5- community.
3+ Thank you for your interest in contributing to our project . Whether it's a bug
4+ report, new feature, correction, or additional documentation , we greatly value
5+ feedback and contributions from our community.
66
7- Before you start working with project, please read our [ Developer Certificate of Origin] [ vmware-cla-dco ] .
7+ Please read through this document before submitting any issues or pull requests
8+ to ensure we have all the necessary information to effectively respond to your
9+ bug report or contribution.
810
9- All contributions to this repository must be signed as described on that page. Your signature
10- certifies that you wrote the patch or have the right to pass it on as an open-source patch
11+ ## Reporting Bugs and Suggesting Enhancements
1112
12- ## Issues
13+ We welcome you to use the [ GitHub issues] [ gh-issues ] to report bugs or suggest
14+ enhancements.
1315
14- We welcome you to use the GitHub issues for bug reports, enhancement requests, feature requests, or
15- documentation updates .
16+ When filing an issue, please check existing open, or recently closed, issues to
17+ make sure someone else hasn't already reported .
1618
17- When filing an issue, please check existing open, or recently closed, issues to make sure someone
18- else has not already reported the issue.
19-
20- Please try to include as much information as you can. Details like these are incredibly useful:
19+ Please try to include as much information as you can using the issue form.
20+ Details like these are incredibly useful:
2121
2222- A reproducible test case or series of steps.
23- - Any modifications you have made relevant to the bug.
23+ - Any modifications you've made relevant to the bug.
2424- Anything unusual about your environment or deployment.
2525
26- You can also start a discussion on the [ discussions] [ gh-discussions ] area to ask questions or share
27- ideas.
26+ ## Contributing via Pull Requests
2827
29- ## Pull Requests
28+ Contributions using pull requests are appreciated.
3029
31- Contributions using pull requests are appreciated. Before opening a pull request, please ensure
32- that:
30+ ** Before** sending us a pull request, please ensure that:
3331
34- 1 . You check existing open, and recently merged, pull requests to make sure it has not already been
35- addressed for an upcoming release.
36- 2 . You [ open a discussion] [ gh-discussions ] to discuss any significant work with the maintainer(s).
37- 3 . You [ open an issue] [ gh-issues ] with a clear description of the problem you are trying to solve if
38- one does not already exist.
39- 4 . You are working against the latest source on the ` develop ` branch.
32+ 1 . You [ open a discussion] [ gh-discussions ] to discuss any significant work with
33+ the maintainer(s).
34+ 2 . You [ open an issue] [ gh-issues ] and link your pull request to the issue for
35+ context.
36+ 3 . You are working against the latest source on the ` develop ` branch.
37+ 4 . You check existing open, and recently merged, pull requests to make sure
38+ someone else hasn't already addressed the problem.
4039
41- To submit a pull request, please:
40+ To open a pull request, please:
4241
43- 1 . Fork the repository and clone your fork.
44- 2 . Create a topic branch from the ` develop ` branch. For example, ` feat/add-x ` or ` fix/update-y ` .
45- 3 . Modify the source. Please focus the scope on the specific change you are contributing.
46- 4 . Ensure that local tests, if any, pass.
47- 5 . Update the documentation, if required. See the ` docs ` directory for the documentation source.
48- 6 . Commit to your fork [ using clear commit messages] [ git-commit ] . Please use [ Conventional Commits] [ conventional-commits ] .
49- 7 . Submit a pull request, answering any default questions in the pull request, and linking to any
50- related issues for context. See [ GitHub flavored markdown syntax] [ gh-markdown ] for references.
51- 8 . Submit a work in progress pull request as a ** draft pull request** . Mark the pull request as
52- ** ready for review** when you are ready for feedback.
53- 9 . Review any automated checks on the the pull request pass.
54- 10 . Stay engaged in the pull request review process.
42+ 1 . Fork the repository.
43+ 2 . Modify the source; please focus on the ** specific** change you are
44+ contributing.
45+ 3 . Ensure local tests pass.
46+ 4 . Updated the documentation, if required.
47+ 5 . Sign-off and commit to your fork
48+ [ using a clear commit messages] [ git-commit ] . Please use
49+ [ Conventional Commits] [ conventional-commits ] .
50+ 6 . Open a pull request, answering any default questions in the pull request.
51+ 7 . Pay attention to any automated failures reported in the pull request, and
52+ stay involved in the conversation.
5553
56- GitHub provides additional document on [ forking a repository] [ gh-forks ] and [ creating a pull request] [ gh-pulls ] .
54+ GitHub provides additional document on [ forking a repository] [ gh-forks ] and
55+ [ creating a pull request] [ gh-pull-requests ] .
5756
58- ### Contributor Workflow
57+ ### Contributor Flow
5958
60- This is a general outline of the workflow for contributing to this project :
59+ This is an outline of the contributor workflow :
6160
6261- Create a topic branch from where you want to base your work.
6362- Make commits of logical units.
64- - Make sure your commit messages are [ in the proper format] [ conventional-commits ] .
65- - Push your changes to a topic branch in your fork of the repository.
66- - Submit a pull request.
63+ - Make sure your commit messages are
64+ [ in the proper format] [ conventional-commits ] ** and** are signed-off.
65+ - Push your changes to the topic branch in your fork.
66+ - Submit a pull request. If the pull request is a work in progress, please open
67+ as draft.
68+
69+ > [ !IMPORTANT]
70+ > This project ** requires** that commits are signed-off for the
71+ > [ Developer Certificate of Origin] [ dco ] .
6772
6873Example:
6974
70- ``` shell
75+ ``` shell
7176git remote add upstream https://github.com/< org-name> /< repo-name> .git
7277git checkout --branch feat/add-x develop
7378git commit --signoff --message " feat: add support for x
@@ -81,7 +86,8 @@ git push origin feat/add-x
8186
8287### Formatting Commit Messages
8388
84- We follow the conventions on [ How to Write a Git Commit Message] [ git-commit ] and [ Conventional Commits] [ conventional-commits ] .
89+ We follow the conventions on [ How to Write a Git Commit Message] [ git-commit ] and
90+ [ Conventional Commits] [ conventional-commits ] .
8591
8692Be sure to include any related GitHub issue references in the commit message.
8793
@@ -97,51 +103,54 @@ Signed-off-by: Jane Doe <jdoe@example.com>
97103Ref: #123
98104```
99105
100- See [ GitHub flavored markdown syntax] [ gh-markdown ] for referencing issues, pull requests, and
101- commits.
102-
103- ### Rebasing the Pull Request with Upstream
106+ ### Staying In Sync With Upstream
104107
105- When your branch gets out of sync with the upstream ` develop ` branch, use the following to update:
108+ When your branch gets out of sync with the ` vmware/develop ` branch, use the
109+ following to update:
106110
107- ``` shell
111+ ``` shell
108112git checkout feat/add-x
109113git fetch --all
110114git pull --rebase upstream develop
111115git push --force-with-lease origin feat/add-x
112116```
113117
114- ### Updating a Pull Request
118+ ### Updating Pull Requests
115119
116- If your pull request fails to pass or needs changes based on code review, you will most likely want
117- to squash these changes into existing commits.
120+ If your pull request fails to pass or needs changes based on code review, you'll
121+ most likely want to squash these changes into existing commits.
118122
119- If your pull request contains a single commit or your changes are related to the most recent commit,
120- you can simply amend the commit.
123+ If your pull request contains a single commit or your changes are related to the
124+ most recent commit, you can simply amend the commit.
121125
122- ``` shell
126+ ``` shell
123127git add .
124128git commit --amend
125129git push --force-with-lease origin feat/add-x
126130```
127131
128132If you need to squash changes into an earlier commit, you can use:
129133
130- ``` shell
134+ ``` shell
131135git add .
132136git commit --fixup < commit>
133137git rebase --interactive --autosquash develop
134138git push --force-with-lease origin feat/add-x
135139```
136140
137- Be sure to add a comment to the pull request indicating your new changes are ready to review. GitHub
138- does not generate a notification when you ` git push ` .
139-
140- [ conventional-commits ] : https://www.conventionalcommits.org/en/v1.0.0/
141- [ git-commit ] : http://chris.beams.io/posts/git-commit/
142- [ gh-discussions ] : https://github.com/vmware/powershell-module-for-vmware-cloud-foundation-instance-recovery/discussions
143- [ gh-forks ] : https://help.github.com/articles/fork-a-repo/
144- [ gh-issues ] :https://github.com/vmware/powershell-module-for-vmware-cloud-foundation-instance-recovery/issues
145- [ gh-markdown ] : https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown
146- [ gh-pulls ] : https://help.github.com/articles/creating-a-pull-request/
147- [ vmware-cla-dco ] : https://cla.vmware.com/dco
141+ Be sure to add a comment to the pull request indicating your new changes are
142+ ready to review, as GitHub does not generate a notification when you ` git push ` .
143+
144+ ## Finding Contributions to Work On
145+
146+ Looking at the existing issues is a great way to find something to contribute
147+ on. If you have an idea you'd like to discuss,
148+ [ open a discussion] [ gh-discussions ] .
149+
150+ [ dco ] : https://probot.github.io/apps/dco/
151+ [ conventional-commits ] : https://conventionalcommits.org
152+ [ gh-discussions ] : hhttps://github.com/vmware/powershell-module-for-vmware-cloud-foundation-password-management/discussions
153+ [ gh-forks ] : https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo
154+ [ gh-issues ] : hhttps://github.com/vmware/powershell-module-for-vmware-cloud-foundation-password-management/issues
155+ [ gh-pull-requests ] : https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request
156+ [ git-commit ] : https://cbea.ms/git-commit
0 commit comments