How we Git

The primary branch for development is dev. The master branch contains the production code. All changes should initially be made in or merged into dev. After the appropriate QA/review, dev (or tags made from dev) can be merged into master. Federalist continuously deploys master to production.

Any changes made to or merged into dev can be viewed on the development site: https://federalist.18f.gov/preview/GSA/open-gsa-redesign/dev/

If you work for GSA Digital Service

When contributing to open.gsa.gov, we typically work on branches off of the main repo, not forks. What does this mean?

1. Create a new branch
2. Make changes in your branch
3. Commit the changes in your branch
4. Push your branch with commits to the repository
5. Optional: After you push your branch to GitHub, preview what your changes will look like on Federalist by going to https://federalist.18f.gov/preview/GSA/open-gsa-redesign/YOUR_BRANCH_NAME (replace YOUR_BRANCH_NAME with the actual name of your branch)
6. Open a pull request to merge your branch into the open-gsa-redesign dev branch.
7. After a successful merge, delete your branch if you want

If you don't work for GSA Digital Service

1. Fork the repository
2. Make changes in your fork
3. Commit the changes in your fork
4. Open a pull request to merge your changes into the open-gsa-redesign dev branch.