893
edits
Changes
→Pull requests
* The GitHub "Squash and merge" button can be used for most small changes.
* A no-ff merge outside of GitHub should be used when it is useful to keep the commit history.
* Bug fixes must be committed to the current stable branch and cherry-picked to master.
* Only new features should be committed to master directly.