Git Branching Strategies for Real Projects

Git isn't just a version control tool — it's the starting point of your entire delivery pipeline. Every CI/CD pipeline, every deployment, every infrastructure change begins with a Git event. A push, a merge, a pull request. Here are the Git commands that actually matter in DevOps: The daily basics: → git clone — copy a repo to your local machine → git pull — get the latest changes from remote → git add . — stage all changes → git commit -m " " — save your changes with a message → git push — send your changes to remote Branching: → git branch — list all local branches → git checkout -b name — create and switch to a new branch → git merge branch-name — merge changes from one branch into another Debugging and recovery: → git log --oneline — see commit history in a clean format → git diff — see exactly what changed between states. → git revert <commit> — undo a commit safely without rewriting history → git stash — temporarily save changes you're not ready to commit Status: → git status — Run git status constantly. It tells you exactly where you are, what's staged, what's not, and what branch you're on. It saves so much confusion. Understanding Git properly means understanding how the entire delivery process begins. What Git command do you wish you had learned earlier? 👇 #DevOps #Git #VersionControl #CICD #LearningDevOps #BeginnerDevOps #TechCareers #LearningInPublic

Day 10 of DevOps — Git Branching Strategy👨💻📈 A branch is a parallel version of your codebase. Let's a developer work on a new feature, a bug fix, or a major change in complete isolation without touching the code that is currently running in production. The main codebase stays stable. The new work happens separately. When it is ready and tested, it gets merged in. The four types of branches — and what each one is for $ Main / Master Branch: The primary branch. Always stable. Always production-ready. This is the source of truth for the current state of the product. Nobody commits experimental work directly here. $ Feature Branches: Short-lived branches created for a specific piece of work. When development is complete and tests pass, it gets merged back into main. Then it is deleted. Feature branches are not meant to live long. $ Release Branches: This one was new to me. > When a version is ready to ship, a release branch is cut from main. Final stabilisation and testing happen here and not on main. > The release goes to customers from this branch. Main continues moving forward with new development while the release branch is locked down for that version. > Let's say Shipping version 1.2 to customers while simultaneously building version 1.3 on main without the two interfering with each other.😮 $ Hotfix Branches: Also new to me.😦 > A critical bug is found in production. You cannot wait for the normal development cycle. > A hotfix branch is created directly from the release branch, the fix is applied, tested, and merged back into both the release branch and main. Production gets the fix fast. Main stays up to date. Coming from backend: I've used feature branches on every project. Main branch protection, PR-based merges, which is a standard practice. But I'd never used release branches or hotfix branches. Working solo on portfolio projects, I never needed them. One thing is for sure: You cannot ship new features and patch production bugs on the same branch. That's what release and hotfix branches solve.👍🏾 #DevOps #Git #BranchingStrategy #GitHub

Git in Real Life: When I started using Git, I thought it’s just for pushing code. But in real production environments, Git becomes the single source of truth. Let me share a real-world scenario Scenario: Production Issue One day, a critical service started failing after deployment. Everything looked fine in CI/CD, but users were facing errors. First step? Not logs… Git history. Using: git log --oneline We traced a recent commit where a config file was modified. Use Case: Root Cause Analysis We compared changes using: git diff <commit-id> Found that: - Environment variable was changed - API endpoint misconfigured A small change, but huge impact. Fix Strategy Instead of manually fixing, we rolled back safely: git revert <commit-id> git push origin main Production stabilized within minutes Daily Use Cases of Git in DevOps - Managing infrastructure code (Terraform, Kubernetes YAMLs) - Version controlling CI/CD pipelines - Tracking configuration changes - Enabling team collaboration - Supporting GitOps workflows Must-Know Commands (Real Usage) git clone <repo> git checkout -b feature-branch git add . git commit -m "feature update" git push origin feature-branch git pull origin main git merge main Troubleshooting Scenarios 1. Merge Conflict git pull origin main Fix conflicts manually → then: git add . git commit -m "resolved conflict" 2. Wrong Commit Made git reset --soft HEAD~1 3. Lost Changes git stash git stash apply 4. Check Who Changed What git blame <file> Key Learning Git is not just a tool. It’s your safety net, audit system, and collaboration engine. In production, debugging often starts from Git, not from code. Final Thought A single commit can: - Break production - Or save hours of debugging So always: Commit smart. Review carefully. Deploy confidently. #Git #DevOps #Troubleshooting #VersionControl #Cloud #Git Lab #MLOPS #devsecops

A clean Git history is a sign of a disciplined engineering team Version control is not just about saving progress but about documenting the evolution of your software Following these five rules will ensure your codebase remains easy to navigate and simple to debug Small Commits Each commit should represent a single logical change. This makes it much easier to revert specific features if something goes wrong. It also simplifies the code review process for your teammates Clear Messages Your commit titles should explain the what and the why. Avoid vague messages like "fixed bug" or "updated file." Meaningful titles turn your git log into a readable history of the project Use Branches Never work directly on the main branch for production code. Create dedicated feature branches for every new task or bug fix. This keeps the main codebase stable and allows for isolated development Pull Requests Every change should be reviewed before it is merged. Pull requests are where the best collaboration happens through code feedback. It ensures higher quality and knowledge sharing across the entire team Sync Regularly Pull updates from the main branch into your local environment frequently. This helps you identify and resolve merge conflicts early in the process. Staying in sync prevents massive headaches when it is finally time to deploy #Git #GitHub #CleanCode #WebDevelopment #VersionControl

🚀 Day 9/100 – Git Fundamentals (Clone, Commit, Push) If you're in DevOps or development, Git is not optional… it’s your daily driver 🚗 Let’s break down the 3 most important commands 👇 🔍 What is Git? Git is a version control system that helps you track changes in your code and collaborate with others. ⚙️ 1. git clone – Get the code git clone https://lnkd.in/gG8mt6kE 👉 Copies a remote repository to your local machine ✍️ 2. git commit – Save your changes git add . git commit -m "Added new feature" 👉 Captures a snapshot of your changes 💡 Think of it as a save point in your project 🚀 3. git push – Upload your changes git push origin main 👉 Sends your commits to the remote repository 🔄 Complete Flow git clone → make changes → git add → git commit → git push 👉 That’s your daily DevOps workflow 🔁 💡 Why Git Matters ✅ Track changes ✅ Collaborate with teams ✅ Rollback if something breaks ✅ Integrates with CI/CD pipelines ⚠️ Common Mistakes ❌ Forgetting git add before commit ❌ Pushing directly to main branch ❌ Writing unclear commit messages ❌ Merge conflicts panic 😅 📌 Key Takeaway 👉 Clone → Work → Commit → Push Master this flow and you’ve mastered Git basics. 💬 What’s your most used Git command daily? #Git #DevOps #VersionControl #CI_CD #100DaysOfDevOps #LearningInPublic

🚀 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

💡 The Day I Realized Why Git Exists Imagine this: Two developers are building a simple calculator app. 👨💻 Dev 1 writes the addition function. 👩💻 Dev 2 writes the subtraction function. Easy, right? Until they need to merge their work. Now there are hundreds of files, dependencies, and updates flying around. One sends code over Slack, another over Gmail. Soon, chaos reigns - overwritten files, lost changes, and the dreaded “it worked on my machine.” That’s when I truly understood what Abhishek Veeramalla meant in his Day 12 DevOps session: 👉 Version Control Systems (VCS) aren’t just tools - they’re lifelines for collaboration. They solve two big headaches: 📌 Sharing code without breaking someone else’s work. 📌 Versioning - keeping history intact so you can roll back to “addition of two numbers” after experimenting with “addition of four.” Earlier systems like SVN were centralized - one server, one point of failure. If that server went down, teamwork stopped. Then came Git, a distributed system where every developer has a full copy of the repo. No single point of failure. No chaos. Just control. And GitHub? It took Git’s power and added collaboration - issues, reviews, project tracking, turning version control into teamwork. Today, when I type git add, git commit, and git push, I’m not just running commands. I’m participating in a system that keeps innovation organized. Because DevOps isn’t just about automation - It’s about building together without breaking each other’s code. #GIT #GitHub #DevOps

🚀 Git is not just a tool… it’s your project’s memory. Most developers learn Git commands. Very few understand what’s actually happening behind the scenes. And that’s where the real power lies. ⸻ 💡 When I started working with Git, I thought: “git add, git commit, git push — done.” But Git is far more than that… 👉 It’s a timeline 👉 It’s a safety net 👉 It’s a collaboration engine ⸻ 📖 As explained in this Git guide Git is a distributed version control system that tracks every change, allowing multiple developers to work on the same codebase efficiently without conflicts — even offline. ⸻ ⚙️ The real game-changer? Understanding the flow: 🧠 Working Directory → Staging Area → Repository Not just commands… but a controlled pipeline of change → You prepare changes (git add) → You record intent (git commit) → You share evolution (git push) ⸻ 🔥 Why Git separates average developers from great engineers: 🔹 You don’t fear breaking things Because you can always roll back 🔹 You don’t overwrite others’ work Because branching keeps things isolated 🔹 You don’t lose progress Because every commit is a checkpoint ⸻ ⚡ Mindset shift: Before Git: ❌ “Don’t touch this code, it might break” After Git: ✅ “Experiment freely, history has your back” ⸻ 💬 One concept that completely changed how I use Git: 👉 Branching strategy Instead of working directly on main… You build, test, and experiment in parallel worlds 🌌 ⸻ 💡 Final thought: Git doesn’t just track code… It tracks decisions, experiments, and evolution And if you master it — You don’t just write code… You control its history #Git #DevOps #VersionControl #SoftwareEngineering #CI_CD #Developers #Coding #Tech #Learning #Engineering

🚀 Day 6 of #100DaysOfDevOps Challenge Today I explored one of the most fundamental pillars of modern software development — Version Control Systems (VCS) and Git 🔥 📌 Here’s what I learned today: 🔹 What is Version Control System (VCS)? A system that tracks changes in code over time, enabling collaboration, history tracking, and easy rollback when needed. 🔹 Why is it important? ✔️ Maintains complete history of changes ✔️ Enables team collaboration ✔️ Supports branching & experimentation ✔️ Ensures code safety and integrity 🔹 What is Git & Why Git? Git is a distributed VCS known for its speed, flexibility, and powerful branching capabilities. It’s widely used in DevOps and CI/CD pipelines. 🔹 Git Stages Explained: 📂 Working Directory – Where you create/modify files 📌 Staging Area – Where changes are prepared (git add) 📦 Repository – Where changes are permanently stored (git commit) 🔹 Git Lifecycle: Modify ➝ Stage ➝ Commit ➝ Push ➝ Pull 🔹 Linux Commands to Install Git: sudo apt install git -y sudo yum install git -y sudo dnf install git -y 🔹 Git Logs: Tracking history using commands like: git log git log --oneline git log --graph 💡 Key Takeaway: Mastering Git is not optional — it’s a must-have skill for every DevOps Engineer to manage code efficiently and collaborate seamlessly. 📈 Every commit you make is a step closer to becoming a better engineer! 🔥 What’s next? Diving deeper into branching strategies and Git workflows! #DevOps #100DaysOfDevOps #Git #VersionControl #Linux #CloudComputing #SoftwareDevelopment #DevOpsJourney #LearningInPublic #TechGrowth #CI_CD #Automation #Programming #Developers #flm #Engineering #CareerGrowth #OpenSource #TechCommunity #BuildInPublic 🚀

Git Series | Day 9: Optimization & Deployment — Squash, Cherry-Pick, and .gitignore 🚀 As I near the end of this series, I am focusing on the "polishing" tools that professional DevOps Engineers use to ensure their repositories are clean, secure, and ready for production. 1. Squash: Consolidating the Journey Why show 10 "work-in-progress" commits when one clean commit will do? Squash allows me to combine multiple commits into a single, meaningful entry. The Command: git rebase -i HEAD~number The Workflow: In the interactive editor, I keep the first commit as "pick" and change the others to "squash." The Benefit: It keeps the master branch history concise and high-level for senior reviewers. 2. Cherry-Pick: Surgical Precision Sometimes you don't want an entire branch; you just want one specific fix or feature. The Concept: Picking a single commit from one branch and applying it to another. The Command: git cherry-pick <commit-id> The Use Case: Great for pulling a critical hotfix from a development branch directly into production without bringing unfinished features along. 3. .gitignore: The Silent Guardian A professional repository should never contain logs, environment variables, or temporary build files. The Mechanism: By creating a .gitignore file, I tell Git which files to permanently ignore from tracking. Standard Exclusions: I typically exclude *.log, .env (security), and folders like /db or node_modules. The Result: Smaller repository size and zero risk of pushing sensitive credentials to GitHub. 4. Deployment: Hosting via GitHub Pages Git isn't just for tracking; it’s for delivering. I practiced hosting static web applications directly from a repository. Push your code to a new GitHub repository. Navigate to Settings > Pages. Select the master branch and save. Your application is live and accessible via a public URL! My use of .gitignore ensures that sensitive configuration data and "garbage" files never enter the version control system. I Streamline Code Reviews: By squashing messy development commits before merging. #Git #DevOps #100DaysOfCode #WebDeployment #GithubPages #CleanCode #SoftwareEngineering #SysAdmin #GitIgnore