From 648936b9baf5493216dd8c4971ab7cffc0abe489 Mon Sep 17 00:00:00 2001 From: Franck Royer Date: Sat, 11 Jun 2022 00:48:31 +1000 Subject: [PATCH] Document change process --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 3d27c26b..b64c6ee1 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,10 @@ Go to [http://localhost:4000](http://localhost:4000) to view the page. - `develop` branch is pushed to [dev.waku.org](https://dev.waku.org) via [this CI Job](https://ci.status.im/job/website/job/dev.waku.org/) - `master` branch is pushed to [waku.org](https://waku.org) via [this CI Job](https://ci.status.im/job/website/job/waku.org/) + +# Change Process + +1. Create a new working branch from `develop`: `git checkout develop; git checkout -b my-changes`, +2. Proceed with changes, push to `origin` and open a Pull Request against `develop`, +3. Once approved, merge pull request, check changes on [dev.waku.org](https://dev.waku.org), +4. Once ready to promote to live website, rebase master on develop: `git checkout master; git pull master; git rebase origin/develop; git push`.