Skip to content

Commit

Permalink
Add "Merging" section
Browse files Browse the repository at this point in the history
  • Loading branch information
bitfl0wer committed Sep 29, 2024
1 parent 4c2b307 commit f30405d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ ever since [we streamlined the process of doing so](https://github.com/polyphony

If you'd like to contribute new functionality, check out [The 'Meta'-issues.](https://github.com/polyphony-chat/chorus/issues?q=is%3Aissue+label%3A%22Type%3A+Meta%22+) They contain a comprehensive list of all features which are yet missing for full Discord.com compatibility.
Please feel free to open an Issue with the idea you have, or a Pull Request.

## Merging

All pull requests opened into the `dev` branch should be merged via the "Squash and Merge" option to keep the commit history small. Merging into the `main` branch should be done via a regular merge commit. This way, GitHub will correctly attribute contributors and count statistics for the insights tab.

0 comments on commit f30405d

Please sign in to comment.