Comprehensive Git Bash and GitHub Learning Guide
Beginner Level
Goals:
- Understand version control basics.
- Learn Git Bash commands for local repositories.
- Familiarize with GitHub basics.
Topics:
1. Introduction to Git and GitHub
- What is version control?
- Differences between Git and GitHub.
- Installing Git and setting up Git Bash.
Example:
# Check Git version
git --version
# Set up user configuration
git config --global user.name "Your Name"
git config --global user.email "your_email@example.com"
2. Creating a Local Repository
- Initializing a repository.
- Adding and committing changes.
Example:
# Initialize a new Git repository
git init
# Add files to staging
git add .
# Commit changes
git commit -m "Initial commit"
3. Basic Git Commands
- Checking repository status.
- Viewing commit history.
Example:
# Check the status of the repository
git status
# View commit history
git log
4. Introduction to GitHub
- Creating a GitHub account.
- Creating a new repository.
- Cloning a repository.
Example:
# Clone a GitHub repository
git clone https://github.com/username/repository.git
Intermediate Level
Goals:
- Work with remote repositories.
- Collaborate using branches and pull requests.
- Resolve merge conflicts.
Topics:
1. Working with Remote Repositories
- Pushing changes to GitHub.
- Pulling changes from a remote repository.
Example:
# Push changes to GitHub
git push origin main
# Pull changes from the remote repository
git pull origin main
2. Branching and Merging
- Creating and switching branches.
- Merging branches.
Example:
# Create a new branch
git branch feature-branch
# Switch to the new branch
git checkout feature-branch
# Merge the branch into main
git checkout main
git merge feature-branch
3. Collaborating with Others
- Forking a repository.
- Submitting pull requests.
Example:
# Add an upstream remote repository
git remote add upstream https://github.com/original-owner/repository.git
# Fetch changes from the upstream repository
git fetch upstream
4. Resolving Merge Conflicts
- Understanding conflicts.
- Resolving conflicts in files.
Example:
# Rebase to resolve conflicts
git rebase main
# Edit the conflicting files and mark them as resolved
git add .
git rebase --continue
Advanced Level
Goals:
- Master advanced Git commands.
- Optimize workflows with GitHub Actions.
- Understand best practices for version control.
Topics:
1. Advanced Git Commands
- Reverting and resetting commits.
- Stashing changes.
Example:
# Revert a commit
git revert <commit-hash>
# Reset to a previous commit
git reset --hard <commit-hash>
# Stash changes
git stash
2. Git Tags
- Creating and pushing tags.
- Using annotated and lightweight tags.
Example:
# Create a tag
git tag -a v1.0 -m "Version 1.0"
# Push tags to the remote repository
git push origin --tags
3. GitHub Actions
- Automating workflows with CI/CD.
- Setting up basic workflows.
Example:
name: CI
on: [push]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Run tests
run: npm test
4. Best Practices
- Writing meaningful commit messages.
- Following Git branching models (e.g., Git Flow).
Example:
# Example of a meaningful commit message
git commit -m "Fix: Corrected issue with login validation"
Final Projects
- Beginner: Set up a personal project repository on GitHub.
- Intermediate: Collaborate on a group project using branches and pull requests.
- Advanced: Automate a deployment workflow for a web application using GitHub Actions.
By following this guide, learners can build a solid foundation in Git and GitHub, progress to advanced workf
