cloudai-x/claude-workflow-v2/managing-git

Feature Development Progress:
- [ ] Step 1: Create feature branch from main
- [ ] Step 2: Make changes with atomic commits
- [ ] Step 3: Rebase on latest main
- [ ] Step 4: Push and create PR
- [ ] Step 5: Address review feedback
- [ ] Step 6: Merge after approval

main ──●────●────●────●────●── (always deployable)
        \          /
feature  └──●──●──┘

main     ──●─────────────●────── (releases only)
            \           /
release      └────●────┘
                 /
develop  ──●──●────●──●──●──
            \     /
feature      └──●┘

<type>(<scope>): <description>
 
[optional body]
 
[optional footer(s)]

feat(auth): add OAuth2 login support
 
Implements Google and GitHub OAuth providers.
Closes #123
 
BREAKING CHANGE: Session tokens now expire after 24h

fix(api): handle null response from payment gateway
 
Previously caused 500 error when gateway returned null.
Now returns appropriate error message to user.

<type>/<ticket-id>-<short-description>
 
# Examples
feature/AUTH-123-oauth-login
fix/BUG-456-null-pointer
chore/TECH-789-upgrade-deps

PR Checklist:
- [ ] Code follows project conventions
- [ ] Tests added/updated for changes
- [ ] All tests pass locally
- [ ] No merge conflicts with main
- [ ] Documentation updated if needed
- [ ] No security vulnerabilities introduced
- [ ] PR description explains the "why"

## Summary
 
[Brief description of changes]
 
## Changes
 
-[Change 1]
-[Change 2]
 
## Testing
 
-[ ] Unit tests added/updated
-[ ] Manual testing performed
-[ ] E2E tests pass
 
## Screenshots (if UI changes)
 
[Before/After screenshots]

# Start new feature
git checkout main
git pull
git checkout -b feature/TICKET-123-description
 
# Commit changes
git add path/to/file  # Stage specific files (git add -p needs an interactive terminal)
git commit -m "feat: description"
 
# Keep up with main
git fetch origin main
git rebase origin/main
 
# Push and create PR
git push -u origin HEAD  # after rebasing an already-pushed branch: git push --force-with-lease

# Amend last commit (before push)
git commit --amend
 
# Undo last commit (keep changes)
git reset --soft HEAD~1
 
# Undo last commit (discard changes)
git reset --hard HEAD~1  # also discards uncommitted changes
 
# Revert a pushed commit
git revert <commit-hash>
 
# Interactive rebase to clean up
git rebase -i HEAD~3
# Non-interactive: git commit --fixup=<sha>, then
GIT_SEQUENCE_EDITOR=: git rebase -i --autosquash HEAD~3

# Cherry-pick specific commit
git cherry-pick <commit-hash>
 
# Find which commit broke something
git bisect start
git bisect bad HEAD
git bisect good <known-good-commit>
 
# Stash with message
git stash push -m "WIP: feature description"
git stash list
git stash pop

Commit Validation:
- [ ] Each commit has a clear, descriptive message
- [ ] Commit type matches the change (feat, fix, etc.)
- [ ] No WIP or temporary commits
- [ ] No secrets or credentials committed
- [ ] Changes are atomic (one logical change per commit)