Skip to content

Commit 1f1890a

Browse files
authored
doc: Updates development practices for external contributors on merging PRs (#2360)
1 parent 52d6e02 commit 1f1890a

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

contributing/development-setup.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,20 @@ For more explained information about plugin override check [Development Override
5151
- Make sure that the PR title follows [*Conventional Commits*](https://www.conventionalcommits.org/).
5252
- Add comments around your new code that explain what's happening.
5353
- Commit and push your changes to your branch then submit a pull request against the `master` branch.
54-
- A repo maintainer will review the your pull request, and may either request additional changes or merge the pull request.
54+
- A repo maintainer will review your pull request.
55+
56+
### Merging a Pull Request
57+
Due to security reasons, there are restrictions on how external contributions can be handled, especially concerning the use of repository secrets and running tests from forks.
58+
Our GitHub setup does not allow sharing of variables and secrets across forks made by external contributors. This is a necessary security measure to prevent unauthorized access and potential vulnerabilities.
59+
60+
As external contributors cannot merge changes from their forks directly nor create branches from the master, the contribution process involves co-authoring. Here's what will happen:
61+
62+
- We will cherry-pick your commit into a new branch in our main repository.
63+
- We will then create a new pull request from this branch, adding you as a co-author to ensure your contribution is not lost.
64+
- Our team will carry out any necessary testing and review on the new pull request. You are welcome to participate in this phase by commenting and making further suggestions.
65+
- Once approved, the pull request will be merged into the main branch.
66+
- **Exception**:
67+
For minor changes that do not affect the core functionality of the project and do not require running tests, exceptions to the above process may be made at the discretion of the project maintainers.
5568

5669
#### PR Title Format
5770

0 commit comments

Comments
 (0)