ACE3/documentation/development/merging-pull-requests.md

38 lines
1.2 KiB
Markdown
Raw Normal View History

2015-04-09 19:09:49 +00:00
---
layout: wiki
title: Merging Pull Requests
description:
2015-04-12 12:42:49 +00:00
group: development
2015-04-09 19:09:49 +00:00
parent: wiki
order: 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:
```diff
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](https://github.com/NouberNou), [KoffeinFlummi](https://github.com/KoffeinFlummi), [Glowbal](https://github.com/Glowbal)) will merge it.
2015-04-12 12:42:49 +00:00
Trivial changes such as spelling fixes can be merged immediately by any contributor.