From 58b729a2afd3c2056f0549f8e063e47a33e45149 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:41:28 -0500 Subject: [PATCH] Update CONTRIBUTING.md --- CONTRIBUTING.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 033ed1335e..fd22174634 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,8 +58,7 @@ Make sure you are following [issue report guidelines](ISSUE_GUIDELINES.md) avail For Talawa Admin, we had employed the following branching strategy to simplify the development process and to ensure that only stable code is pushed to the `main` branch: - `develop`: For unstable code and bug fixing -- `alpha-x.x.x`: for stability teesting -- `main`: Where the stable production ready code lies +- `main`: Where the stable production ready code lies. This is our default branch. #### Conflict Resolution