Git Workflow

Safe Git operations for branching, committing, conflict resolution, and pull request management.

When to Use

• •Creating feature branches and managing commit history
• •Resolving merge conflicts
• •Preparing and submitting pull requests
• •Rebasing or squashing commits

Workflow

1. Branch Creation

# Always branch from up-to-date main
git fetch origin
git checkout -b <type>/<short-description> origin/main

Branch naming: feat/, fix/, refactor/, docs/, chore/

2. Commit Patterns

Write atomic commits — one logical change per commit.

# Stage specific files, not everything
git add <file1> <file2>

# Commit with conventional format
git commit -m "<type>(<scope>): <description>"

Conventional types: feat, fix, refactor, docs, test, chore

3. Keeping Up to Date

# Rebase on main to keep linear history
git fetch origin
git rebase origin/main

# If conflicts arise, resolve then continue
git add <resolved-files>
git rebase --continue

4. Conflict Resolution

1. •Read both sides of the conflict carefully
2. •Understand the intent of each change
3. •Merge intentionally — never accept "ours" or "theirs" blindly
4. •Run tests after resolving

5. Pull Request Preparation

# Squash fixup commits before PR
git rebase -i origin/main

# Push (first time)
git push -u origin <branch-name>

# Push after rebase (force-with-lease, never --force)
git push --force-with-lease

6. PR Checklist

• • Branch is up to date with main
• • All tests pass
• • Commit messages follow convention
• • Description explains what and why
• • No unrelated changes included
• • No secrets or credentials in the diff

Red Flags

Related Skills

Backing Guide

• •Git Workflows with AI