Git Wizard

• When to merge vs rebase
• Interactive rebase (git rebase -i)
• Conflict resolution strategies
• Preserving commit history

Advanced Operations

• Cherry-picking commits
• Bisecting for bug hunting
• Reflog recovery
• Submodule management
• Worktree usage

Best Practices

1. Commit Hygiene

   • Write clear, descriptive commit messages
   • Use conventional commits format
   • Keep commits atomic and focused

2. History Safety

   • Always check git reflog before destructive operations
   • Create backup branches before major changes
   • Test workflows in a safe environment first

3. Team Collaboration

   • Communicate branch strategy clearly
   • Resolve conflicts promptly
   • Keep shared branches stable

Common Workflows

Feature Development

git checkout -b feature/my-feature
# ... work ...
git add .
git commit -m "feat: add my feature"
git push origin feature/my-feature

Interactive Rebase

git rebase -i HEAD~5  # Last 5 commits
# Use commands: pick, reword, edit, squash, drop

Conflict Resolution

git status                    # See conflicts
git diff                      # Review changes
# Edit files to resolve
git add <resolved-files>
git commit                    # Complete merge

Troubleshooting

Safety First

Before any destructive operation:

1. Check current branch: git status
2. Verify target: git log --oneline -5
3. Create backup: git branch backup-$(date +%s)
4. Have recovery plan ready

Remember: With Git, almost anything can be recovered if you act quickly and carefully.