90 Days of DevOps Day 22: Mastering Git

Today I learned some important GitHub concepts that every developer should know 🚀 ✅ Adding changes using Git ✅ Using git status to track changes ✅ Writing meaningful commit messages ✅ Creating and working with branches ✅ Handling and resolving merge conflicts ✅ Merging changes back into the main branch Today’s journey: create a branch → make changes → face merge conflicts → resolve them → successfully merge everything back into main. These concepts are important because they help keep code organized, make teamwork easier, and prevent accidental loss of code. Step by step, I’m getting better at development, DevOps, and collaboration. #GitHub #Git #VersionControl #Branches #MergeConflict #Coding #DeveloperJourney #DevOps #LearningGitHub

Day 24 of learning and practicing DevOps 🔁 Worked on advanced Git concepts -- Worked on: • Merging branches (fast-forward vs merge commit) • Handling merge conflicts and resolving them manually • Understanding rebase and how it rewrites history • Squash vs regular merge for clean commit history • Using git stash to manage work-in-progress • Applying cherry-pick for selective commits Important part: once understood the flow: edit → add → continue It became clear that Git is not complicated — it’s just strict about tracking changes. Learning today --> history matters Merge keeps history Rebase rewrites history depends on the situation. Here are my notes: https://lnkd.in/gWM2ZrM2 📍 #DevOps #Git #VersionControl #GitHub #LearningInPublic #90DaysOfDevOps #TrainWithShubham

Pushing code is easy… making it run automatically is the real game 🤯 Day 18 of my DevOps Journey 🚀 Today I learned how to integrate Git with Jenkins — and this is where things start getting real. Instead of just storing code in GitHub, I connected a public repository to Jenkins and triggered a build pipeline. From creating a freestyle job → linking the Git repo → installing Git on the server → running “Build Now”… I was able to see my code being pulled and executed automatically. That moment when the build shows SUCCESS ✅ That’s when you realize DevOps is not theory anymore. Key learning: Code + Automation = Real DevOps This is just the beginning — next step is automating this entire flow without clicking anything manually ⚙️ Have you ever triggered your first build in Jenkins? How did it feel? 👇 #DevOps #Jenkins #Git #CICD #LearningInPublic #100DaysOfDevOps #Day18

Ever noticed this? 😄 ✈️ git commit – smooth, controlled, everything looks fine 🚀 git push – boom! things go live 👥 git add . – adding EVERYTHING like there’s no tomorrow 😂 This meme perfectly captures a common developer habit… We carefully commit changes… We confidently push them… But when it comes to staging, we go all in with git add . 😅 👉 Reality check: Blindly adding everything can sometimes push unwanted files, secrets, or bugs. 💡 Best Practice: Be intentional. Use: • git add <file> • git status before commit Because in DevOps & development… small discipline = big stability #Git #DevOps #ProgrammingHumor #SoftwareEngineering #DeveloperLife

Git Series | Day 8: Mastering Git Rebase — The Professional Standard for Clean History 🛠️✨ Integration is easy; maintaining a clean, readable history is hard. Today I moved beyond the standard 3-way merge to master Git Rebase, the tool that allows DevOps teams to keep their project timelines linear and manageable. 1. The Problem: The "Mixed" History of 3-Way Merges While a 3-way merge works, it has two major drawbacks in large-scale projects: Extra Commits: Every merge creates a "Merge Commit" which doesn't contain actual code changes, just integration data. Non-Linearity: The commit history becomes a "tangled web" of branches crossing over each other, making it difficult to audit or debug specific features. 2. The Solution: What is Rebase? Rebase is the process of moving or combining a sequence of commits to a new base commit. Instead of "merging" the branches, I am effectively rewriting the history so it looks like the feature branch was started from the most recent commit on the master branch. The Result: A perfectly linear history with no extra merge commits. The Command: While on the feature branch, run < git rebase master > 3. The Rebase Conflict Workflow Conflicts in rebase happen commit-by-commit, giving you granular control. My standardized resolution process is now: Identify: Find the file causing the conflict. Resolve: Edit the file, remove the headers/conflict markers. Stage: git add <file>. Safety Valve: If things go wrong, git rebase --abort brings me back to the pre-rebase state. #Git #DevOps #GitRebase #CleanCode #VersionControl #SoftwareArchitecture #100DaysOfCode #GitWorkflow #EngineeringExcellence

🚀 Day 39 – Git Merge Conflicts & Resolution ⚠️🔧 Today I learned about merge conflicts in Git and how to resolve them — an important skill when working in team projects 💻 ⚠️ What is a Merge Conflict? A merge conflict occurs when two changes are made to the same file or line of code in different branches, and Git is unable to automatically merge them. 🔍 When Do Conflicts Happen? Two developers edit the same file Same line is modified in different branches Changes overlap ⚙️ How to Identify Conflict When merging, Git shows: <<<<<<< HEAD Your changes ======= Other branch changes >>>>>>> feature 🛠️ Steps to Resolve Conflict 1️⃣ Open the conflicted file 2️⃣ Identify the conflicting code 3️⃣ Edit and keep the correct version 4️⃣ Remove conflict markers 5️⃣ Add and commit 👉 Commands: git add . git commit -m "resolved conflict" 💡 Best Practices ✔ Pull latest code before starting work ✔ Use small commits ✔ Communicate with team ✔ Avoid editing same file simultaneously 📌 My Learning Today Understanding merge conflicts helped me realize how important collaboration and proper version control are in real-world projects. Resolving conflicts is a key DevOps skill 💪 #Git #MergeConflict #DevOps #VersionControl #CloudComputing #LearningJourney #TechSkills #WomenInTech #CloudEngineer

Back to Git and GitHub today and it felt good to reconnect the dots. I revisited some core concepts that quietly power almost every development workflow: • Cloning a repository to the local machine and working on code comfortably • Creating branches to keep changes isolated and organized • Pushing changes to different branches without affecting the main codebase • Merging branches to bring everything together It’s easy to overlook these basics, but they are the foundation of collaborative development. One question I had while learning was whether this can be called a CI CD pipeline. Not exactly. What I practiced is part of version control and collaboration. CI CD goes a step further by automating building, testing, and deploying code whenever changes are pushed. Still, understanding Git workflows is a key step before diving into CI CD. Refreshing these concepts made me realize how important strong fundamentals are. They make everything else easier. What Git concept took you the longest to fully understand? #Git #GitHub #VersionControl #LearningJourney #SoftwareDevelopment

🚀 Day 13 of #100DaysOfDevOps Today I explored some powerful Git commands that help in better code management and recovery: 🔹 Config – Set up Git username, email, and preferences 🔹 Ignore – Avoid tracking unnecessary files using .gitignore 🔹 Amend – Modify the last commit (message or changes) 🔹 Reset – Undo changes and move to a previous state 🔹 Reflog – Track all Git actions and recover lost commits 🔹 Cherry-pick – Apply a specific commit from one branch to another 💡 These commands are very useful in real projects for fixing mistakes, managing commits, and maintaining clean history. 📌 Learning step by step, improving every day! #DevOps #Git #VersionControl #LearningJourney #TechSkills #100DaysOfCode

Git Workflow (At a Glance) 🚀 Most developers use Git daily, but many still struggle with the difference between the Staging Index and Local Repo, or when to Merge vs. Rebase. If you’re guessing your way through your terminal, you’re eventually going to break a production branch. Stop memorizing commands and start understanding the architecture. 🛠 The Three Areas You Must Know: Working Directory: Where you actually write the code (Untracked/Modified). Staging Index: The "loading dock" where you prep your changes for a commit. Local Repo (.git/): Your personal history of snapshots. Remote Repo: Where the team collaborates (GitHub/GitLab). 💡 Key Technical Takeaways: Merge vs. Rebase: Merging preserves the full history with a "merge commit." Rebase rewrites history for a clean, linear timeline. Choose wisely based on your team's workflow. File Lifecycle: A file isn't just "saved"—it moves from Untracked → Staged → Committed → Modified. The "Safety Net" Commands: Learn git stash for temporary work and git revert to fix mistakes without destroying the commit history. The Reality Check: You aren’t a Senior Engineer until you can manage a complex branching model without losing data. Save this infographic for your next "merge conflict" headache. #DevOps #Git #VersionControl #CloudEngineering #SoftwareDevelopment #CodingTips #TechCommunity

🚀 Day 25 of #90DaysOfDevOps Today I learned how to handle mistakes in Git like a pro 🔥 ✅ Explored git reset (--soft, --mixed, --hard) ✅ Learned safe undo using git revert ✅ Understood when NOT to rewrite history ✅ Studied real-world branching strategies 💡 Key Insight: 👉 Reset rewrites history, Revert preserves it. Knowing the difference is critical in team environments. 🔥 Real-world use: Teams use revert for production safety and reset for local cleanup — avoiding broken pipelines and conflicts. #DevOps #Git #GitHub #LearningInPublic #90DaysOfDevOps #SoftwareEngineering