Skip to main content
U.S. Army Corps of Engineers
®
US Army Corps of EngineersInstitute for Water Resources, Risk Management Center
Developer Resources

Quick Reference

Daily Workflow​

# Start of day
git checkout main
git pull origin main
git checkout -b feature/new-feature

# During development
git add .
git commit -m "feat(scope): what I did"
git push origin feature/new-feature

# Ready for review
# Update with main, create PR on GitHub

# After approval
# Squash and merge via GitHub UI

Key Commands​

# Create branch
git checkout -b <type>/<description>

# Commit
git commit -m "<type>(<scope>): <message>"

# Update branch with main
git checkout main && git pull origin main
git checkout <your-branch> && git merge main

# Push
git push origin <branch-name>

# Delete local branch after merge
git branch -d <branch-name>

Getting Help​

  • Workflow questions: Ask in team Slack/Teams channel
  • Technical blockers: Pair with another developer
  • Process improvements: Suggest in team meeting or create issue in SOP repo
  • Git emergencies: Contact an Organization Owner
Last updated on