docs: tweak contributing guide, merge in change management guidance
# Contributing
-When contributing to this repository, please first discuss the change you wish to make via issue,
-email, or any other method with the owners of this repository before making a change.
+When contributing to this repository, please first discuss the change you wish to make via [issue](https://github.com/codeforphilly/chime/issues), [Slack chat](https://codeforphilly.org/chat/covid19-chime-penn), or any other method with the owners of this repository before making a change.
-Please note we have a code of conduct, please follow it in all your interactions with the project.
+Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
## Active Needs
-We maintain a list of [issues](https://github.com/codeforphilly/chime/issues) in this repo that encompasses work requested by stakeholders and technologists. Each issue is designed to be small enough for one person to implement.
+We maintain a list of [issues in the Code for Philly repo](https://github.com/codeforphilly/chime/issues) that encompasses work requested by stakeholders and technologists. Each issue is designed to be small enough for one person to implement.
**Developers** If you are new to the project, check out open issues to see if there is any pre-existing work needed that you can handle. We will need to add your git account to the repo to grant write access - contact us on [Slack](https://codeforphilly.org/chat) in the [covid19-chime-penn](https://codeforphilly.org/chat?channel=covid19-chime-penn) channel.
## Change Management
-Developers working on this project must adhere to our [Change Management practices](https://github.com/CodeForPhilly/chime/master/.github/CHANGEMGMT.md).
+- Base all work on the latest `master` branch available in [Code for Philly's fork of the `chime` repository](https://github.com/CodeForPhilly/chime).
+- Submit your work in the form of a pull request against that same branch.
+- 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.
+- 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.
## Requesting Functionality
-**Stakeholders/Users** Find us on [Slack](https://codeforphilly.org/chat) in the [covid19-chime-penn](https://codeforphilly.org/chat?channel=covid19-chime-penn) channel to see if your need is already being addressed.
+**Stakeholders/Users** Find us on [Slack](https://codeforphilly.org/chat) in the [#covid19-chime-penn](https://codeforphilly.org/chat/covid19-chime-penn) channel to see if your need is already being addressed.
