ACE3/documentation/development/merging-pull-requests.md
KoffeinFlummi d2fbd5c735 Fix groups
2015-04-12 14:42:49 +02:00

1.2 KiB

layout title group parent order
wiki Merging Pull Requests development wiki 5

Who's responsible for merging pull requests.

All authors must add themselves to the AUTHORS.txt file with a valid email adress.

Changes To Existing Addons

The people responsible for merging changes to existing addons are the maintainers listed in the README.md file of the respective addon folder.

If the changes consists of trivial changes, such as spelling or indentation fixes:

     valueA = 12;
     valueB = 31;
-     valueC =2;
+    valueC = 2;

... the PR can be merged right away by one of the maintainers.

Non-trivial pull requests remain open for a minimum of 48 hours, to give all other contributors time to comment on potential issues, and are then merged by a maintainer, should no issues arise.

New Addons / Other Changes

If a pull request adds a new addon, or changes something else, like the README, everyone has 72 hours to comment on the changes. After that, one of the team leads (NouberNou, KoffeinFlummi, Glowbal) will merge it.

Trivial changes such as spelling fixes can be merged immediately by any contributor.