Multi-Computer Git Workflow Guide

Development Environment Synchronization

🚀 Starting a New Session

  1. Open terminal in your project directory
  2. Run git status to check current state
  3. Run git pull to get latest changes
  4. Verify all dependencies are up to date
  5. Start your development environment

🛑 If You Have Uncommitted Changes

  1. Run git status to see what's changed
  2. Add files with git add .
  3. Commit with git commit -m "Your message here"
  4. Push with git push

Verify You're Ready

  1. Run git status - should show "nothing to commit"
  2. Run git pull - should show "Already up to date"
  3. Now you're ready to start working

🏁 Ending a Session

  1. Save all your work
  2. Run git status to see what's changed
  3. Add files with git add .
  4. Commit with git commit -m "Your message here"
  5. Push with git push

🚫 Common Issues

  • If git status shows .DS_Store files: Ignore them (handled by .gitignore)
  • If merge conflicts occur: Stop and resolve before proceeding
  • If unsure: Run git status to check current state

💡 Best Practices

  • ALWAYS check status before starting work
  • ALWAYS push changes before switching computers
  • NEVER force push unless absolutely necessary
  • Keep commits meaningful and descriptive

Note: This guide is for private use across your development machines:

  • Mac Studio
  • MacBook Air
  • ASUS A16 Advantage (Windows)
🕒 Last updated: April 21, 2025