From 680266718272c0a7cd681ab4fafd1ecbdfb7460f Mon Sep 17 00:00:00 2001 From: Daniel Kaiser Date: Tue, 26 Jul 2022 10:22:18 +0200 Subject: [PATCH] list new deploy process in README (#76) * list new deploy process in README * Update README.md Co-authored-by: ksr --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index e2b29ad..0d9b85f 100644 --- a/README.md +++ b/README.md @@ -1 +1,15 @@ # Vac.dev Website + +made and deployed with [logos site-builder](https://github.com/acid-info/logos-site-builder) + +# Continuous Deloyment + +- `staging` branch is deployed to [staging.vac.dev](https://staging.vac.dev) +- `master` branch is deployed to [vac.dev](https://vac.dev) + +# Change Process + +1. Create a new working branch from `staging`: `git checkout staging; git checkout -b my-changes`; +2. Proceed with changes, push to `origin` and open a Pull Request against `staging`; +3. Once approved, merge pull request, check changes on [staging.vac.dev](https://staging.vac.dev); +4. Once ready to promote to live website, rebase master on staging: `git checkout master; git pull master; git rebase origin/staging; git push`.