Git and GitHub for DevOps

🚀 Conquering Git & GitHub: My Challenge Adventure

🔍 What is Git and Why Is It Important?

Git is a distributed version control system used by developers to track changes in code over time. It allows multiple people to collaborate on a project without overwriting each other's work. You can roll back to earlier versions of code, work on multiple features simultaneously, and keep everything organized. 💡

🔧 Why Git Matters in DevOps

In DevOps, Git is absolutely essential because:

• 🛠️ Automation: CI/CD tools integrate seamlessly with Git to automate testing and deployments.

• 📦 Infrastructure as Code: Git stores not just application code, but infrastructure configurations.

• 🤝 Collaboration: Enables cross-functional teams to develop, test, and deploy code collaboratively.

• 🧪 Safe experimentation: Easily create branches, test features, and merge once verified.

🔁 Git vs GitHub: What’s the Difference?

💼 Challenge Tasks Breakdown

✅ Task 1: Fork & Clone the Repository

1. I forked the one repository on GitHub.

2. Cloned it locally using HTTPS:

    git clone <your-fork-url>
    cd 2025/git/01_Git_and_Github_Basics
   

✅ Task 2: Initialize a Local Repository and Create a File

1. Created a new folder for the challenge:

    mkdir challenge
    cd challenge
   

2. Initialized Git:

    git init
   

3. Created a file called info.txt with my details and added it to Git and committed the changes:

    git add info.txt
    git commit -m "Initial commit: Add info.txt with introductory content"
   

✅ Task 3: Configure Remote with PAT & Push

🔐 To simplify authentication (for this exercise only), I configured Git to use a PAT (Personal Access Token):

git remote add origin https://<your-username>:<your-PAT>@github.com/<your-username>/90DaysOfDevOps.git

If origin already exists:

git remote set-url origin https://<your-username>:<your-PAT>@github.com/<your-username>/90DaysOfDevOps.git

4. Pushed changes to GitHub:

    git push -u origin main
   

5. Verified everything synced correctly using pull request:

    git pull origin main
   

✅ Task 4: Explore Your Commit History

🕵️ I checked the commit log to review history and hashes:

git log

This helped me understand the flow of changes and track each commit with confidence.

✅ Task 5: Advanced Branching & Switching

1. Created a new feature branch:

    git branch feature-update
    git switch feature-update
   

2. Edited info.txt with more details, then committed

🔁 I then opened a Pull Request on GitHub to merge feature-update into main.

💥 (Optional) I created an experimental branch to simulate a merge conflict, merged it into feature-update, resolved the conflict manually, and committed the fix.

✅ Task 6: Branching Strategies Explained

Branching strategies are the backbone of collaborative development. Here's why they matter:

• 🧩 Isolating Features and Fixes: Branches allow developers to work on features or bug fixes independently without affecting the main code.

• 🚦 Parallel Development: Multiple developers can work simultaneously using different branches.

• 🧼 Reducing Merge Conflicts: Proper branch management helps prevent messy conflicts during integration.

• 👀 Enabling Code Reviews: Teams can review and test code in branches before merging to production.

🗂️ Common branching strategies include:

• main or master: Stable production-ready code.

• dev: Staging area for integration.

• feature/*: Used for developing new features.

• hotfix/*: For urgent bug fixes in production.

• release/*: Prepares code for release.

---

🏁 Wrapping Up

This Git & GitHub challenge was a great deep dive into real-world version control workflows. From setting up remotes using PATs to branching, merging, and resolving conflicts, I now feel more confident in using Git in a collaborative DevOps environment. 🙌