1. Introduction to Git

   • Source code management comparison (centralized vs. distributed)
   • Git's design philosophy and advantages
   • Common Git workflows overview
   • Git command-line interface basics
   • Git internals: objects, references, and the .git directory
   • Understanding commits, trees, and blobs

2. Working with Repositories

   • Cloning existing repositories
   • Initializing new repositories
   • Configuring Git (user identity, editor, aliases)
   • Adding and removing files and directories
   • The staging area (index) and its role
   • Ignoring files with .gitignore

3. Tracking Changes

   • The Git workflow: working directory, staging, repository
   • Committing changes with meaningful messages
   • Viewing and understanding diffs
   • Amending commits
   • Stashing work in progress

4. History and Repository State

   • Searching the Git repository (git grep, git log filtering)
   • Checking status of Git objects
   • Log analysis and visualization (git log options, graphs)
   • Viewing file history and annotations (git blame)
   • Comparing commits, branches, and tags

Day 2: Collaboration & Advanced Techniques

5. Branches and Merges

   • Understanding branches as lightweight pointers
   • Creating and switching branches
   • Merging branches (fast-forward vs. three-way merge)
   • Resolving merge conflicts step-by-step
   • Merge strategies and options
   • Rebasing commits: when and why
   • Interactive rebase for commit cleanup
   • Cherry-picking specific commits

6. Working in Teams

   • Remote repositories: adding, fetching, pulling, pushing
   • Centralized workflow (single shared repository)
   • Feature branch workflow (topic branches and pull requests)
   • Gitflow workflow (master, develop, feature, release, hotfix branches)
   • Forking workflow (open-source collaboration model)
   • Comparing workflows: choosing the right one for your team
   • Mono-repos vs. multi-repos: trade-offs and considerations
   • Using submodules and subtrees for dependency management

7. Fixing Things

   • Cherry-picking commits across branches
   • Undoing changes: reset vs. revert vs. restore
   • Recovering lost commits with reflog
   • Housekeeping: garbage collection, pruning, and repository maintenance
   • Rewriting history: risks and best practices
   • Handling detached HEAD state

8. Git with IDEs

   • Using Git in Visual Studio
   • Using Git in Visual Studio Code
   • Leveraging GUI tools for visualization and conflict resolution
   • Integration with GitHub, Azure DevOps, GitLab

9. What's Next: Git in the DevOps Pipeline

   • Continuous Integration with Git hooks and automation
   • Continuous Delivery and deployment triggers
   • Deployment patterns and branching strategies
   • Semantic versioning and tagging releases
   • Code review workflows and pull request best practices

10. Tips, Tricks & Best Practices

    • Writing effective commit messages
    • Commit early, commit often
    • Keeping commits atomic and focused
    • Branch naming conventions
    • When to rebase vs. merge
    • Securing repositories and handling sensitive data
    • Git aliases and productivity shortcuts
    • Troubleshooting common issues