zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-23 03:06:01 +02:00
Code Issues Projects Releases Packages Wiki Activity

Document our merge process

Browse source
This commit is contained in:
rachidatecs 2023-05-11 12:55:37 -04:00
parent 1ec355290e
commit c47ba8ea9e
No known key found for this signature in database
GPG key ID: 3CEBBFA7325E5525
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
docs/developer/README.md
View file

@ -22,6 +22,18 @@ Visit the running application at [http://localhost:8080](http://localhost:8080).
We use the branch convention of `initials/branch-topic` (ex: `lmm/fix-footer`). This allows for automated deployment to a developer sandbox namespaced to the initials.
## Merging and PRs
To bring your feature branch up-to-date wih main:
```
git checkout main
git pull
git checkout <feature-branch>
git merge orgin/main
git push
```
## Setting Vars
Non-secret environment variables for local development are set in [src/docker-compose.yml](../../src/docker-compose.yml).