summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorFrancesco Borzì <borzifrancesco@gmail.com>2020-06-02 22:10:16 +0200
committerGitHub <noreply@github.com>2020-06-02 22:10:16 +0200
commitdea9c857602fb9c359781a9079fe136852c454d7 (patch)
tree33841ec6cd15b980acc59a48c39af47ab40bee90 /docs
parent939d86ba7e8bb9ebc64242977828ba3f288d266b (diff)
downloadwiki-dea9c857602fb9c359781a9079fe136852c454d7.tar.gz
wiki-dea9c857602fb9c359781a9079fe136852c454d7.tar.bz2
wiki-dea9c857602fb9c359781a9079fe136852c454d7.zip
Create merge-process.md
Diffstat (limited to 'docs')
-rw-r--r--docs/merge-process.md20
1 files changed, 20 insertions, 0 deletions
diff --git a/docs/merge-process.md b/docs/merge-process.md
new file mode 100644
index 0000000..f0ee555
--- /dev/null
+++ b/docs/merge-process.md
@@ -0,0 +1,20 @@
+# AzerothCore Merge process
+
+### PRs merge rate
+
+At AzerothCore we merge only a few PRs daily (usually 1 or 2 per day), picking them from the [[To Be Merged]](https://github.com/azerothcore/azerothcore-wotlk/pulls?q=is%3Apr+is%3Aopen+label%3A%22To+Be+Merged%22) list.
+
+Everyday we pick the oldest PRs to merge, unless there are more urgent PRs that need to be merged first for any reasons.
+
+Users can request to the AC Staff to give a PR a higher priority if they really need to have it merged soon, we are quite flexible with that.
+
+This process might appear too "slow" to someone, however there are several reasons for that:
+
+- Provides a constant activity on the master branch, so people can regularly plan to update their servers knowing that the amount of changes in a certain window of time it's going to be always more or less the same.
+
+- Everyone has the possibility to review PRs before they get merged into master, stability is important for us.
+
+- Despite we have a very strict process of accepting PR (we require at least 1 code review approval and 1 manual tester approval),
+it can always happen that bugs get to master branch.
+If we merge too many PRs at once, it's hard to understand which one of them was faulty.
+Merging a low amount of PRs per day enables us to quickly identify faulty commits and fix/revert them asap.