Git & GitHub Workflows

Quick Reference

Workflow Composition

Workflows build on each other:

PR → Commit → Pull

• •Creating PR first commits changes
• •Committing first pulls latest from main

Pull Workflow

Pull latest changes and sync with remote.

Scope

• •Single repo: If specific repo mentioned or clearly working in one, only pull that repo
• •All repos: If "all" is said or unspecified, pull all git repos in workspace

On main branch

• •Clean working directory: git pull origin main
• •Has uncommitted changes: git stash && git pull origin main && git stash pop — resolve conflicts but do NOT push

On feature branch

1. •Merge latest main: git fetch origin && git merge origin/main
2. •Push the branch: git push

Rules

• •Never force push
• •Summarize results for each repo

Commit Workflow

Commit changes to current branch.

Before Committing

1. •Pull latest - Sync with main using pull workflow
2. •Run checks - Lint, format, build, test, and any repo-specific commands
3. •Fix issues - Fix all warnings and errors

Commit

1. •Stage relevant changes
2. •Write clear, concise commit message focused on the "why"
3. •Commit the changes

PR Workflow

Create a PR against main.

Before Creating PR

1. •Pull and merge main - Always fetch and merge latest main first:
   bash

   git fetch origin && git merge origin/main
   

   Resolve any merge conflicts before proceeding.
2. •Commit changes - Apply commit workflow (runs checks)
3. •Create new branch if needed

Create the PR

1. •Push to remote (with -u flag if new branch)
2. •Create PR using gh CLI
3. •Open browser tab to the PR's /files page: open <pr-url>/files
4. •Return the PR URL as clickable markdown link: [PR #N](url)

Output Format

Always format URLs as clickable markdown links:

• •PR link: [PR #123](https://github.com/owner/repo/pull/123)
• •Any other URLs should also be linked

Monitor CI

Use gh CLI to monitor CI status. If CI fails:

1. •Investigate the failure
2. •Fix the issue
3. •Push the fix
4. •Repeat until CI passes

After CI Passes

Check PR for auto-fixable review feedback:

1. •Fetch PR comments and reviews using gh api
2. •Review bot feedback for actionable suggestions
3. •Fix issues that can be resolved without human input
4. •Push fixes and reply to comments acknowledging changes
5. •Repeat until no more auto-fixable feedback remains

Reset to Main Workflow

Reset repos to clean main branch state.

Trigger

• •"reset to main", "start fresh", "clean slate"

Process

For each git repo in workspace:

1. •Check for uncommitted changes: git status --porcelain
2. •If changes exist: Stash with descriptive message
   bash

   git stash push -m "Auto-stash before reset: $(date +%Y-%m-%d)"
   

3. •Switch to main: git checkout main
4. •Pull latest: git pull origin main
5. •Install dependencies: npm i (if package.json exists)

Track which repos had stashes created.

Output Summary

After processing, provide summary:

## Reset Complete

| Repo | Stashed? | Stash Summary |
|------|----------|---------------|
| repo1 | Yes | 2 modified files: src/index.ts, package.json |
| repo2 | No | - |
| repo3 | Yes | 1 new file: test/draft.ts |

For stashed repos, include:

• •Number of files affected
• •Key file names (truncate if many)
• •Type of changes (modified, new, deleted)

Recovering Stashed Changes

# View stashes
git stash list

# Apply most recent stash (keeps stash)
git stash apply

# Apply and remove stash
git stash pop