Crew Coordination

Team Collaboration Protocols

Successful crews follow workflows that reduce conflicts and keep collaboration smooth.

Common Workflows

Feature Branch Workflow

• main is always stable
• Create feature branches for all work
• Merge via pull requests after review
• Delete branches after merging

Git Flow

A more structured approach:

• main: Production code
• develop: Integration branch
• feature/*: New features
• release/*: Release preparation
• hotfix/*: Emergency fixes

GitHub Flow (Simple)

1. Pull the latest main
2. Create a feature branch
3. Commit changes
4. Open a pull request
5. Review and discuss
6. Merge and deploy

Best Practices

• Commit often: Small, logical commits
• Pull frequently: Stay up to date
• Write clear messages: Future you will thank you
• Review before merging: Catch issues early
• Keep main stable: Always deployable
• Delete merged branches: Reduce clutter

Code Review

Pull requests enable peer review:

• Catch bugs before merging
• Share knowledge
• Maintain code quality
• Discuss approaches

Merge Strategies

• Merge commits: Preserve history
• Squash: Clean, linear history
• Rebase: Linear without merge commits

Choose based on your team's preference.

Continuous Integration

Automate testing and deployment:

• Run tests on every push
• Block merges if tests fail
• Deploy automatically

Next: Docking Requests

Understanding workflows prepares you for pull requests—the standard way teams review and merge code.