How we Git

We generally follow the 18F model: How we Git.

The master branch contains the production code. All changes should initially be made in a feature branch, then submitted for merging to master via a PR. Federalist continuously deploys master to production.

If you have commit access to the repository:

1. Create a feature branch
2. Make your changes in your feature branch
3. Commit and push your changes to your feature branch
4. Preview your changes on Federalist at https://federalist-ecc58765-2903-48b3-920c-5d93318ad084.app.cloud.gov/preview/gsa/open-gsa-redesign/YOUR_FEATURE_BRANCH/ (where YOUR_FEATURE_BRANCH is the name of your branch)
5. When all looks correct, open a pull request to the master branch

If you don't have commit access to the repository:

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.

As soon as your pull request is accepted, your changes will go to production.

Resources

• Understanding the GitHub flow
• Creating and deleting branches
• Creating a pull request