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

Merge pull request #606 from cisagov/jm/clarification-on-merging

Browse source 
Expand on Merging and PRs documentation
This commit is contained in:
rachidatecs 2023-05-15 10:54:30 -04:00 • committed by GitHub
commit b3085dfa1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/developer/README.md
View file

@ -24,6 +24,7 @@ We use the branch convention of `initials/branch-topic` (ex: `lmm/fix-footer`).
## Merging and PRs
History preservation and merge contexts are more important to us than a clean and linear history, so we will merge instead of rebasing.
To bring your feature branch up-to-date wih main:
```
@ -34,6 +35,11 @@ git merge orgin/main
git push
```
Resources:
- [https://frontend.turing.edu/lessons/module-3/merge-vs-rebase.html](https://frontend.turing.edu/lessons/module-3/merge-vs-rebase.html)
- [https://www.atlassian.com/git/tutorials/merging-vs-rebasing](https://www.atlassian.com/git/tutorials/merging-vs-rebasing)
- [https://www.simplilearn.com/git-rebase-vs-merge-article](https://www.simplilearn.com/git-rebase-vs-merge-article)
## Setting Vars
Non-secret environment variables for local development are set in [src/docker-compose.yml](../../src/docker-compose.yml).