New Client Git Workflow

General Git Workflow

The general git workflow for this is as follows:

• Work in develop
• develop is branched from main
• develop is then merged back into main
• Deploys happen roughly every other day

Here’s an example with actual git commands:

1. Pull down the latest code in develop:

Note: This assumes that you have a clean git state and everything is checked in.

git co develop
git pull origin develop

1. Run any migrations that come down:

Note: Bundle exec is not shown below as shell aliases vary.

rails db:migrate

1. Create your local branch

Note: Branch names generally conform to “GPA-some_ticket_number”

git branch GPA-1004

1. Do your work in the branch and then push to the branch for review.

Note: Rubocop will be automatically run on your code.

# ideally you aren't adding a ton of files with git add .
# use good sense
git add .
git commit -m "A capitalized and well written description under 60 chars"

Note: If your branch is long lived then you may need to periodically pull develop back in to get the latest changes. Generally, the more often you do this, the easier your merge conflicts are but ymmv. Last Updated On: 2025-09-01 04:31:51 -0400