Skip to content

Commit c38bf92

Browse files
Merge pull request #1086 from millmason/986--update-contributors-guide
Task 986: update contributors guide
2 parents 2ae8936 + 13dc8e8 commit c38bf92

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

docs/CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ To ensure smooth contributions to the Clean & Green Philly project, please follo
2222
- Clone your fork of the repository to your local machine using `git clone`
2323
- Keep your fork up to date with the original repository by following the instructions [here](https://docs.github.com/en/get-started/quickstart/fork-a-repo#keep-your-fork-synced)
2424
- [ ] **Set up your local environment**: Follow instructions in the [SETUP](/docs/SETUP) folder
25+
- [ ] **Make sure you're up-to-date with the `staging` branch** To maintain repo organization and protection, merges to main are not allowed. All changes must be made through pull requests to the `staging` branch.
2526
- [ ] **Create a new branch**:
2627
- Name it `<github-username>/<issue-number>-<kebab-case-description>`
2728
- Example: `vimusds/1069-fix-territory-on-mobile`
2829
- [ ] **Work on the issue**: Make your changes, commit them, and push to your branch
29-
- [ ] **Open a Pull Request (PR)**: Use the provided template, tag relevant issues, and provide testing instructions
30+
- [ ] **Open a Pull Request (PR)**: Use the provided template, tag relevant issues, and provide testing instructions. Make sure the base branch of the PR is set to `base: staging`.
3031
- [ ] **Ensure all checks pass**: Fix any errors and re-check
3132
- [ ] **Tag reviewers**: Find appropriate reviewers from the [CODEOWNERS](https://github.com/CodeForPhilly/vacant-lots-proj/blob/main/.github/CODEOWNERS) file
3233
- [ ] **Close the issue**: Once your PR is merged, comment on the issue to close it, tagging the relevant reviewer(s)

0 commit comments

Comments
 (0)