From c9087d9bf476e6cd28c90c4013df3edf6658d5a3 Mon Sep 17 00:00:00 2001 From: Peter Harrison <16875803+palisadoes@users.noreply.github.com> Date: Sat, 25 Nov 2023 18:54:10 -0500 Subject: [PATCH] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0f6b96927..033ed1335e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,11 +55,11 @@ Make sure you are following [issue report guidelines](ISSUE_GUIDELINES.md) avail #### Branching Strategy -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 `master` branch: +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 -- `master`: Where the stable production ready code lies +- `main`: Where the stable production ready code lies #### Conflict Resolution