github/vac.dev
1
1
Fork 0
mirror of https://github.com/vacp2p/vac.dev.git synced 2026-01-09 14:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add change process instructions (#58)

Browse Source
This commit is contained in:
Franck R
2022-04-22 22:54:52 +10:00
committed by GitHub
parent 9d6ddec150
commit a84394ff57
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -24,6 +24,14 @@ Originally created by [EthWorks](https://ethworks.io/).
- `develop` branch is pushed to [dev.vac.dev](https://dev.vac.dev) via [this CI Job](https://ci.status.im/job/website/job/dev.vac.dev/) - `develop` branch is pushed to [dev.vac.dev](https://dev.vac.dev) via [this CI Job](https://ci.status.im/job/website/job/dev.vac.dev/)
- `master` branch is pushed to [vac.dev](https://vac.dev) via [this CI Job](https://ci.status.im/job/website/job/vac.dev/) - `master` branch is pushed to [vac.dev](https://vac.dev) via [this CI Job](https://ci.status.im/job/website/job/vac.dev/)
# 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.vac.dev](https://dev.vac.dev),
4. Once ready to promote to live website, rebase master on develop: `git checkout master; git pull master; git rebase origin/develop; git push`.
# Known Issues # Known Issues
### Bundler and Jekyll on Apple M1 (with Ruby `x86_64`) ### Bundler and Jekyll on Apple M1 (with Ruby `x86_64`)