1,057
edits
Changes
From Gramps
Add Merging and Pull requests sections
==Merging==
* Most changes should be squashed and fast-forwarded.
* Major new features should be merged no-ff to maintain their development identity.
* This applies both to pull requests and to work by developers with write permission to the repository.
==Pull requests==
* Pull requests must be code-reviewed and tested by a developer.
* PR authors should not be assumed to be Git experts, so it's up to the Gramps developer doing the merge to ensure that the PR is clean and won’t make a mess of history.
* 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.
==Log messages==
Every commit to Git must be accompanied by a log message. These messages will be generated into a ChangeLog when a release is made and should conform to the following guidelines:
