Understanding Git Workflows for DevOps

Day 26 of My DevOps Journey After learning the basics of Git yesterday, today I explored one of its most powerful features - Branching and Merging 🧩 What is a Branch? A branch in Git allows you to work on new features, fixes, or experiments without affecting the main codebase. Think of it like creating a parallel world to code freely you can merge it back later when ready. Common Branching Commands git branch feature-login # Create a new branch git checkout feature-login # Switch to that branch git branch # List all branches git merge feature-login # Merge branch into main git branch -d feature-login # Delete a branch after merging Why Branching Matters in DevOps ✅ Enables multiple developers to work simultaneously ✅ Keeps production (main) stable ✅ Simplifies testing and review ✅ Encourages better workflow and version control Tip: Use meaningful branch names like feature/add-login, bugfix/api-timeout, or release/v2.0 — it helps maintain clarity across teams! How do you manage your Git workflow Git Flow, GitHub Flow, or something custom? Share your approach below 👇 #Day26 #DevOpsJourney #Git #Branching #Merging #GitFlow #GitHubFlow #VersionControl #DevOps #LearningInPublic #Automation #Collaboration #CloudComputing #InfrastructureAsCode

Day 29 of My DevOps Journey — Understanding Git Merge vs Git Rebase When working with branches, you’ll often need to bring changes from one branch into another. Two powerful ways to do this are merge and rebase — but they work differently 1️⃣ Git Merge — Safe & Simple Merges the history of two branches together by creating a new commit. git checkout feature git merge main ✔ Keeps full history ✔ No rewriting ✔ Ideal for teams Visual: main + feature → merge commit → new combined history 2️⃣ Git Rebase — Clean & Linear Rewrites your feature branch so it appears as if you created it on top of the latest main branch. git checkout feature git rebase main ✔ Cleaner, linear history ✔ Great for solo/small teams ⚠ Avoid rebasing shared branches Visual: feature history gets replayed on top of main (looks cleaner) When to Use What? Working with a team - Merge Private/local branch cleanup - Rebase Keeping history exact - Merge Creating a clean linear history - Rebase Tip: Never rebase a branch that others are already using. It rewrites commits and can break their history! Question for you: Are you team Merge or Rebase? Tell me in the comments #Day29 #DevOpsJourney #GitRebase #GitMerge #GitForBeginners #VersionControl #DevOpsLife #GitHub #SoftwareEngineering #CleanCode #100DaysOfDevOps #LearnDevOps #TechLearning #CodingTips #DevelopersCommunity #DevOpsTools #GitWorkflow #OpenSourceLove

Day 28 of #100DaysOfDevOps — Understanding Git Cherry-Pick In collaborative projects, not every branch is ready for merging. Sometimes, you only need one specific change from another branch — that’s where git cherry-pick shines. What is Git Cherry-Pick? git cherry-pick allows you to apply a specific commit from one branch onto another without merging all the commits. This is especially helpful when:  You want to move a hotfix or bug patch to the main branch.  You only need a specific update from an experimental branch.  You want to control exactly what goes into production. Basic Syntax: git checkout <target-branch> git log <source-branch> git cherry-pick <commit-hash> git push origin <target-branch> Example: git checkout master git log feature git cherry-pick abc1234 git push origin master As a DevOps engineer, understanding Git’s branching and commit management tools is essential for maintaining clean, stable, and traceable code releases. Cherry-picking ensures precision — you can promote tested fixes to production without merging incomplete features. I found this Medium post by Amir Mustafa helpful: https://lnkd.in/dNzH3n8W #Git #DevOps #100DaysOfDevOps #KodeKloud #VersionControl

Day 25 of My DevOps Journey Today, I began exploring one of the most powerful and essential tools in the DevOps world — Git 🧑💻 What is Git? Git is a distributed version control system that tracks changes in your codebase, helps you collaborate with others, and ensures every version of your project is safely stored. Instead of manually managing files or folders, Git makes it easy to: Record every change (commit) Revert to older versions Work in parallel with multiple teammates Merge updates efficiently Why Git in DevOps? ✅ Enables collaboration across teams ✅ Tracks changes for audit & rollback ✅ Integrates with CI/CD pipelines (like Jenkins, GitHub Actions) ✅ Forms the backbone of Infrastructure as Code (IaC) Common Git Commands git init # Create a new repository git clone <url> # Download an existing repo git add . # Stage changes git commit -m "msg" # Save changes git status # View current repo state git log # View commit history git push origin main # Upload code to remote repo git pull # Fetch and merge latest changes Tip: Commit often, with clear messages every commit should represent a meaningful change. What do you use for version control GitHub, GitLab, or Bitbucket? #Day25 #DevOpsJourney #Git #VersionControl #GitHub #GitLab #Bitbucket #DevOps #LearningInPublic #Automation #Collaboration #TechLearning #CloudComputing #InfrastructureAsCode

Day 26 of My DevOps Journey After learning Git fundamentals, today I explored one of its most powerful features — Branching & Merging This is what makes Git so flexible and team-friendly. What is a Branch? A branch is like a separate workspace where you can make changes without affecting the main code. It allows multiple developers to work on different features or fixes at the same time safely! Example: git branch feature-login # create a new branch git checkout feature-login # switch to it Now you’re working in your own isolated environment Merging Branches Once your work is done and tested, you can merge it back into the main branch. Example: git checkout main git merge feature-login This combines your changes with the main project. Handling Merge Conflicts Sometimes, two people edit the same line and Git asks for help! You’ll see conflict markers in the file. Resolve them manually, then run: git add . git commit -m "Resolved merge conflict" Tip: Use short-lived branches and merge frequently to avoid large, complex conflicts. #Day26 #DevOpsJourney #Git #Branching #Merging #VersionControl #DevOps #LearningInPublic #Collaboration #SoftwareDevelopment #GitTips

𝐃𝐀𝐘 𝟎𝟒 — 𝐆𝐞𝐭𝐭𝐢𝐧𝐠 𝐒𝐭𝐚𝐫𝐭𝐞𝐝 𝐰𝐢𝐭𝐡 𝐆𝐢𝐭 𝐒𝐞𝐭𝐮𝐩 𝐚𝐧𝐝 𝐂𝐨𝐫𝐞 𝐂𝐨𝐦𝐦𝐚𝐧𝐝𝐬 Yesterday, I introduced Git and why it’s a crucial part of DevOps workflows. Today, let’s talk about how to set it up and understand the key components that make it work. 𝐒𝐞𝐭𝐭𝐢𝐧𝐠 𝐔𝐩 𝐆𝐢𝐭 After installing Git, the first thing to do is set your global identity , this helps Git know who’s making each change. 𝐠𝐢𝐭 𝐜𝐨𝐧𝐟𝐢𝐠 --𝐠𝐥𝐨𝐛𝐚𝐥 𝐮𝐬𝐞𝐫.𝐧𝐚𝐦𝐞 "𝐘𝐨𝐮𝐫 𝐍𝐚𝐦𝐞" example: git config --global user.email "you@example.com" 𝐘𝐨𝐮 𝐜𝐚𝐧 𝐜𝐨𝐧𝐟𝐢𝐫𝐦 𝐲𝐨𝐮𝐫 𝐜𝐨𝐧𝐟𝐢𝐠𝐮𝐫𝐚𝐭𝐢𝐨𝐧 𝐰𝐢𝐭𝐡: 𝐠𝐢𝐭 𝐜𝐨𝐧𝐟𝐢𝐠 --𝐥𝐢𝐬𝐭 Important Sections of Git 𝐑𝐞𝐩𝐨𝐬𝐢𝐭𝐨𝐫𝐲 (𝐑𝐞𝐩𝐨) – This is where your project lives. You can create one locally using: 𝐠𝐢𝐭 𝐢𝐧𝐢𝐭 𝐖𝐨𝐫𝐤𝐢𝐧𝐠 𝐃𝐢𝐫𝐞𝐜𝐭𝐨𝐫𝐲 – The actual files you’re editing. Staging Area (Index) – Where changes are reviewed before committing. Add files to staging with: 𝐠𝐢𝐭 𝐚𝐝𝐝 [𝐟𝐢𝐥𝐞] 𝐂𝐨𝐦𝐦𝐢𝐭 – A snapshot of your staged changes. 𝐠𝐢𝐭 𝐜𝐨𝐦𝐦𝐢𝐭 -𝐦 "𝐜𝐨𝐦𝐦𝐢𝐭 𝐦𝐞𝐬𝐬𝐚𝐠𝐞" 𝐑𝐞𝐦𝐨𝐭𝐞 𝐑𝐞𝐩𝐨𝐬𝐢𝐭𝐨𝐫𝐲 – The shared version stored online (e.g., GitHub). 𝐠𝐢𝐭 𝐫𝐞𝐦𝐨𝐭𝐞 𝐚𝐝𝐝 𝐨𝐫𝐢𝐠𝐢𝐧 [𝐫𝐞𝐩𝐨-𝐮𝐫𝐥] 𝐠𝐢𝐭 𝐩𝐮𝐬𝐡 𝐨𝐫𝐢𝐠𝐢𝐧 𝐦𝐚𝐢𝐧 Understanding these parts will help you move from basic version control to efficient collaboration — which is the heartbeat of DevOps. #DevOps #Git #VersionControl #LearningJourney #Day6 #TechTools

🌟 #MyDevOpsJourney – Week 5: Mastering Git & Version Control 🧩💻 This week was all about tracking, managing, and collaborating on code the DevOps way — through Git & GitHub! I learned how teams across the globe contribute to the same project seamlessly using version control. 🚀 🧩 What I Built & Practiced: ✅ Initialized local Git repos and configured user identity ✅ Created, switched & merged branches for new features ✅ Resolved merge conflicts using Git CLI ✅ Used stash, reset & revert to manage commits safely ✅ Added a .gitignore file to keep repos clean ✅ Connected local repo to GitHub for real-world collaboration ✅ Explored log, diff & rebase for understanding commit history 🧠 What I Learned: 🔹 How distributed version control enables smooth teamwork 🔹 When to use merge vs rebase 🔹 Importance of clean commits & branching strategies 🔹 How Git improves CI/CD workflows & automation ⚡ Key Takeaways: 💡 Git is the language of collaboration in DevOps 💡 Every commit tells a story — good version control = professional habits 💡 Git + GitHub = the backbone of modern software teamwork 🕒 Next Week Goals: 🚀 Learn CI/CD pipelines with tools like Jenkins 🔧 Automate builds & deployments 📊 Connect Git with end-to-end DevOps workflows 📁 Reference: 📘 Resource: https://lnkd.in/dTUsGGBK ✨ “Version control isn’t about saving files — it’s about saving collaboration and innovation.” #DevOps #Git #GitHub #VersionControl #Collaboration #SoftwareEngineering #LearningInPublic #MyDevOpsJourney #ContinuousLearning #TechCommunity #Innovation

⚙️ Day 8 – “The First Commit – How Every DevOps Story Begins 💻✨” Every developer remembers their first commit — that tiny line of code that says, “Let’s build something.” 🚀 Here’s how the Git journey actually starts 👇 🧱 git init – The Birth Creates a new Git repository right inside your folder. “git init” → Congratulations, your project just got a heartbeat ❤️ 📋 git status – The Mirror Shows what’s changed, what’s staged, and what’s not. It’s like checking the mirror before your first client demo. 😅 🗂️ git add . – The Staging Area Adds all your new or modified files to the stage. “Everyone ready? Cameras rolling!” 🎬 🖋️ git commit -m "message" – The Declaration Officially records your snapshot in Git history. “Scene 1: System Setup — Take 1.” 🎞️ 🔍 git log – The Memory Lane Displays your previous commits — your timeline of every experiment, bug-fix, and success. Proof that progress is just a bunch of small commits. 💪 💬 Moral of the Story Every DevOps journey begins with: init ➡ status ➡ add ➡ commit ➡ log Five commands. One story. From idea → reality → history. Keep committing — not for GitHub streaks, but because progress deserves documentation. 🧠 ❓ Your Turn What was your first ever commit message? (Confess honestly — was it “first commit”? 😅)

DevOps Revisit — Git Branching Strategies 🔀 Git Flow vs Trunk-Based vs GitHub Flow Today, I revisited one of the most fundamental yet often overlooked topics in DevOps — how we branch, collaborate, and deliver code. While exploring Git Flow, Trunk-Based, and GitHub Flow, I realized something simple but powerful: your branching strategy doesn’t just define how you write code — it defines how your team thinks, collaborates, and ships reliably. 💡 Git Flow gave me a sense of structure — perfect for large, versioned releases. ⚡ Trunk-Based showed me what true CI/CD speed looks like — constant integration and feedback. 🚀 GitHub Flow reminded me how simplicity can empower teams to move fast without friction. Each has its own rhythm, and choosing the right one depends on your team’s maturity, automation, and goals. The deeper I went, the more I understood why branching isn’t just a version control strategy — it’s a DevOps philosophy. #DevOpsRevisit #Git #BranchingStrategy #CICD #DevOps #GitFlow #TrunkBasedDevelopment #GitHubFlow #SoftwareEngineering

🚀 Day 6 of My DevOps Practising Journey “𝐄𝐯𝐞𝐫 𝐰𝐨𝐧𝐝𝐞𝐫𝐞𝐝 𝐡𝐨𝐰 𝐝𝐞𝐯𝐞𝐥𝐨𝐩𝐞𝐫𝐬 𝐰𝐨𝐫𝐤 𝐭𝐨𝐠𝐞𝐭𝐡𝐞𝐫 𝐰𝐢𝐭𝐡𝐨𝐮𝐭 𝐨𝐯𝐞𝐫𝐰𝐫𝐢𝐭𝐢𝐧𝐠 𝐞𝐚𝐜𝐡 𝐨𝐭𝐡𝐞𝐫’𝐬 𝐜𝐨𝐝𝐞?🤔💻” That’s exactly what I learned this week — how Git & GitHub make teamwork smooth and error-free. Before this, I used to think coding was just about writing programs. But now I realise — in real projects, it’s all about collaboration and version control. Here’s what I explored 👇 🧠 Git Workflow — The system that keeps projects organised. • Branches: Separate workspaces for each task or feature. • Commits: Snapshots of code — small, meaningful, and reversible. • Merges: Combining work safely without conflicts. • Pull Requests: Asking teammates to review before merging — teamwork at its best. 👥 Roles in Collaboration • Owner: Creates and manages the repo. • Developer: Works on new features using dev branches. • Protected Main Branch: Keeps production code clean and stable. 💻 Developer Tools I also explored VS Code, the IDE that simplifies everything — from writing and debugging code to integrating Git commands directly in one place. Each step made me realise how big tech teams maintain discipline, structure, and accountability in every project. 💬 Takeaway: “Git teaches you more than version control — it teaches coordination, clarity, and respect for clean code.” #DevOps #Git #GitHub #VersionControl #VCS #Collaboration #LearningInPublic #TechJourney #CareerGrowth #SoftwareEngineering