From 816872bf9c56f29959bd11256225d7f2e40d0dd9 Mon Sep 17 00:00:00 2001 From: fryorcraken Date: Tue, 20 May 2025 15:20:16 +1000 Subject: [PATCH] Add git branching instructions --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 5a601c7..dc3c6f6 100644 --- a/README.md +++ b/README.md @@ -94,3 +94,11 @@ yarn clear The hosting is done using [Caddy server with Git plugin for handling GitHub webhooks](https://github.com/status-im/infra-misc/blob/master/ansible/roles/caddy-git). Information about deployed build can be also found in `/build.json` available on the website. + +## Change Process + +1. Create a new working branch from develop: git checkout develop; git checkout -b my-changes. +2. Make your changes, push them to the origin, and open a Pull Request against the develop branch. +3. After approval, merge the pull request, and verify the changes on the staging server (e.g., https://dev.vac.dev). +4. When ready to promote changes to the live website, rebase the master branch on the staging changes: git checkout master; git pull origin master; git rebase origin/develop; git push. +