Skip to content

Commit 60ff3d2

Browse files
author
Nick Canzoneri
committed
Update contributing docs to reflect new main branch
1 parent a04a18a commit 60ff3d2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docs/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ We maintain a list of [issues in the Code for Philly repo](https://github.com/co
1212

1313
## Change Management
1414

15-
- Base all work on the latest `master` branch available in [Code for Philly's fork of the `chime` repository](https://github.com/CodeForPhilly/chime).
15+
- Base all work on the latest `develop` branch available in [Code for Philly's fork of the `chime` repository](https://github.com/CodeForPhilly/chime).
1616
- Submit your work in the form of a pull request against that same branch.
1717
- Check in on your pull request periodically after you submit it to see if any changes have been requested or any merge conflicts have arisen from other work getting integrated.
18-
- If a merge conflict arises, please rebase your branch against the latest `master` branch and force-push the new branch as early as you can. You may need to do this more than once before your changes get merged. Do your best to keep your branch in a mergeable state until it is finished being reviewed and accepted.
18+
- If a merge conflict arises, please rebase your branch against the latest `develop` branch and force-push the new branch as early as you can. You may need to do this more than once before your changes get merged. Do your best to keep your branch in a mergeable state until it is finished being reviewed and accepted.
1919

2020
## Requesting Functionality
2121

0 commit comments

Comments
 (0)