diff --git a/README.md b/README.md index a02084a..4b54738 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,15 @@ -## Description +# RLNp2p Website -Content of `[your-site]` website +Made and deployed with [logos site-builder](https://github.com/acid-info/logos-site-builder). -## Practical notes -- Please keep this repo clean and for markdown content ONLY -- In case you have any issue with rendering, how website looks (design), etc, please file an issue on [logos website builder](https://github.com/acid-info/logos-site-builder/issues). And/or feel free to contact Amir. +# 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`.