Git Mistakes: Undoing Errors with Git Reset & Revert

Day 25 - Git Reset Vs Revert & Branching Strategies This week I focused on one of the most underrated Git skills: undoing safely at scale. Here’s the executive summary: • git reset rewrites history. Powerful. Dangerous. Local use only. • git revert preserves history. Safe. Production-ready. If your code is already pushed, revert. If you’re cleaning up locally, reset. Understanding this distinction is the difference between: • Confident engineering • And breaking your team’s main branch at 2AM Branching strategy should be a reflection of your organizational DNA, not just a technical preference: • GitFlow: Designed for enterprise-grade control and structured, scheduled release cycles. • GitHub Flow: Optimized for agile startups requiring rapid, continuous deployment. • Trunk-Based Development: The benchmark for continuous value flow of DevOps culture prioritizing CI/CD and minimal merge friction. Full commit history on GitHub: https://lnkd.in/gNDRhAXq #90DaysOfDevOps #DevOpsKaJosh #TrainWithShubham

Day 25 of my #90DaysOfDevOps journey Today I explored Git Reset vs Git Revert and understood how to safely undo mistakes in Git. Practiced --soft, --mixed, and --hard resets and learned when each should be used. Compared reset vs revert and understood why revert is safer for shared branches. Also researched branching strategies like GitFlow, GitHub Flow, and Trunk-Based Development. This helped me understand how real engineering teams manage code at scale. 🔗 GitHub Notes: https://lnkd.in/gptC5JTw #90DaysOfDevOps #DevOps #Git #VersionControl #TrainWithShubham #LearningInPublic

🚀 𝗗𝗲𝘃𝗢𝗽𝘀 – 𝗗𝗮𝘆 𝟭𝟭: 𝗛𝗼𝘄 𝗚𝗶𝘁 𝗜𝘀 𝗔𝗰𝘁𝘂𝗮𝗹𝗹𝘆 𝗣𝗿𝗮𝗰𝘁𝗶𝗰𝗲𝗱 𝗶𝗻 𝗥𝗲𝗮𝗹 𝗗𝗲𝘃𝗲𝗹𝗼𝗽𝗺𝗲𝗻𝘁 Ever wonder how Git is actually practiced in real development — not just learned from tutorials? We all know the basics: git add → git commit → git push But real engineering teams don’t work like that. 🔥 The Big Difference: In real projects, nobody pushes directly to main. Instead, teams follow structured workflows: 🔹 main → Always production-ready 🔹 develop → Integration branch 🔹 feature/* → For new features 🔹 hotfix/* → For urgent fixes You don’t just “code and push”. You: 1️⃣ Create a feature branch 2️⃣ Work locally with clean, meaningful commits 3️⃣ Push the branch 4️⃣ Open a Pull Request 5️⃣ Go through Code Review 6️⃣ Merge after approval That review step alone changes everything. Because now: Your code must be readable Your commits must be clean Your changes must not break others’ work Git becomes a collaboration tool — not just a version control tool. 🧠 What I Realized Git workflow teaches engineering maturity: Think before committing Write meaningful commit messages Keep branches organized Don’t break production Respect team structure This is where DevOps mindset begins. It’s not about knowing commands. It’s about building safely, collaboratively, and professionally. Practice Notes: https://lnkd.in/gvSS7mVy #DevOps #Git #SoftwareEngineering #bongodev 🚀

🚀 Day 24 & 25 – From Basic Git to Real Engineering Git Most people learn: 👉 git add 👉 git commit 👉 git push But real engineers master: ✅ Merge vs Rebase ✅ Stash & Cherry Pick ✅ Reset vs Revert ✅ Branching Strategies This week I went deep into advanced Git workflows — the skills that separate beginners from confident developers. 🔀 Day 24 – Advanced Git 🔁 Merge vs Rebase Learned how fast-forward merge works. Understood when Git creates a merge commit. Practiced git rebase and saw how it rewrites history. Key rule: Never rebase shared branches. 📦 Git Stash Mid-feature but urgent bug? git stash saves your unfinished work like a temporary locker. Real-world lifesaver. 🍒 Cherry Pick Needed only ONE fix from a branch? git cherry-pick <commit> Applied a single commit without merging everything. Powerful. Dangerous if misused. 🔥 Day 25 – Undoing Mistakes Like a Pro 🟢 git reset --soft → Undo commit, keep staged changes --mixed → Undo commit, keep working changes --hard → Deletes everything (danger zone ⚠️) Rule: Never reset pushed commits. 🔄 git revert Safely undo changes by creating a new commit. ✔ Keeps history ✔ Safe for teams ✔ Production-friendly 🌳 Branching Strategies I Explored GitFlow Best for large teams with release cycles. GitHub Flow Simple + fast + PR based. Perfect for startups shipping quickly. Trunk-Based Development Short-lived branches + strong CI. Used by high-performance teams. 🧠 Biggest Lessons Merge preserves history. Rebase rewrites history. Reset deletes. Revert protects. Stash saves your context. Cherry-pick isolates fixes. Strategy depends on team size and release model. Git is not just commands — it’s engineering discipline. This DevOps journey is getting deeper every day. Day 24 & 25 complete ✅ Consistency > Motivation. #DevOps #Git #OpenSource #SoftwareEngineering #100DaysOfDevOps #LearningInPublic #VersionControl #DevOpsKaJosh #TrainWithShubham

🚀 5 Essential Git Branching Strategies 1. Feature Branching: The classic approach. Create a dedicated branch for every new feature and delete it once merged. Perfect for keeping the main history clean. 2. GitFlow: Best for projects with scheduled release cycles. It uses dedicated branches for main, dev, features, releases, and hotfixes. Complex, but highly structured. 3. GitLab Flow: A middle ground that links branching to environments (e.g., staging, preprod). Great for when your code needs to pass through multiple validation gates. 4. GitHub Flow: Simple and agile. The main branch is always deployable. You branch off for a fix or feature, then merge back immediately after testing. Ideal for Continuous Delivery. 5. Trunk-Based Development: The speed demon's choice. Developers merge small, frequent updates into a single "trunk" (main). Large features are hidden behind feature flags to keep the build stable. Which one should you choose? • Small team/SaaS? GitHub Flow is your best friend. • Enterprise/Regulated industry? GitLab Flow or GitFlow offers the control you need. • High-velocity DevOps? Trunk-Based is the way to go. How does your team handle branching? Are you a GitFlow traditionalist or a Trunk-Based speedster? Let's discuss in the comments! 👇 #SoftwareEngineering #WebDevelopment #Git #DevOps #CodingTips #TechCommunity #Programming #VersionControl

Excited to share that I recently worked on the Git Branching topic in DevOps and prepared a detailed presentation on it. Learning how branching helps teams collaborate, manage versions, and maintain clean code workflows was a great experience. Looking forward to exploring more concepts in DevOps and software development. 🚀 different commands like 1 git init 2 git branch 3 git switch branch_name 4 git add . 5 git commit -m " msg " 6 git push origin main #DevOps #GitBranching #TechLearning #StudentsInTech

Git Branching Strategy: How to structure your development like a PRO! 👨💻🛡️ You've learned to code, you can build features, but when multiple people work on a project, visual flow and organization become crucial. This hand-drawn guide breaks down a professional Git Branching strategy into clear, easy-to-digest notes. 🚀 Why this matters: A good branching strategy ensures your Main branch is ALWAYS production-ready and that feature development or emergency hotfixes can happen concurrently and merge smoothly. It’s a foundational skill for real-world development! Key takeaways inside: Branch Types & Purpose: Understand Master, Develop, Feature, Hotfix, and Release branches. (icons: Gold Medal, Gear, Puzzle piece, Fire, Rocket!) Visual Flow & Commands: A diagram showing the exact git flow from a Feature to Production, including branching, commiting, push, PR, merge points, and CI/CD triggers. Pro Tips: git merge feature/X, git branch -a, git checkout -b, TAG v1.0, and a reminder about Pull Request gateways and protected Main branches. Save this for your team, or your next personal project's workflow! 📌 Let me know your best branching tips in the comments!👇 #Git #DevOps #SoftwareEngineering #CodingCommunity #Studentmindset #Hustle

🚀 Day 60 of my Learning Journey – Git Cherry-Pick 🎯 Discovered how to copy specific commits between branches using Git Cherry-Pick. A small command, but extremely powerful when working with multiple branches in real-world projects. 📘 What is Git Cherry-Pick? Git Cherry-Pick allows you to select a specific commit from one branch and apply it to another branch. Instead of merging an entire branch, you can bring only the exact change you need. This is very useful when fixing bugs or moving small features across branches without affecting other changes. ⚙️ Key Commands & Features 🔹 git cherry-pick <commit-id> – Applies a specific commit from another branch to the current branch. 🔹 Find Commit ID using git log – Helps identify the exact commit you want to copy. 🔹 Resolve Conflicts if they occur – Similar to merge conflicts when changes overlap. 🔹 git cherry-pick --continue – Continue the cherry-pick process after resolving conflicts. 🔹 git cherry-pick --abort – Cancel the cherry-pick operation if needed. 💡 Key Takeaway Understanding Cherry-Pick helps me manage code changes more efficiently and is an important skill for working with Git in DevOps workflows. 📈 💻 Real-World Usage in Industry 🔹 Hotfix management – Developers move urgent bug fixes from development to production branches quickly. 🔹 CI/CD workflows – Teams apply critical commits to release branches without merging incomplete features. 🔹 Production stability – Only safe and verified commits are applied to production environments. 🔹 Multi-branch development – Used when maintaining different versions of software simultaneously. #Git #GitHub #DevOpsLearning #TechJourney #ContinuousLearning #SoftwareDevelopment #CareerGrowth

🚨 Your Git branching strategy might be slowing your team down. I've watched dev teams spend weeks debating Git workflows… Meanwhile their competitors are shipping features twice as fast. The real question isn't: "Which Git strategy is the best?" The real question is: "Which strategy fits how MY team actually works?" ⚠️ What usually kills engineering velocity: → Using GitFlow for a 3-person startup that deploys daily → Forcing Trunk-Based on teams that require QA sign-off → Copying what Google does when you're not Google → Choosing complexity because it looks more professional ✅ Match the strategy to your reality: 1️⃣ GitHub Flow — Fast & Simple Main branch always deployable Branch → test → merge → ship Best for: SaaS teams, startups, continuous delivery 2️⃣ GitFlow — Structured Releases Separate branches for dev, release, hotfix Best for: enterprise teams, scheduled releases, regulated environments 3️⃣ GitLab Flow — Environment Driven Branches mapped to staging / preprod / production Best for: teams with validation gates or compliance checks 4️⃣ Trunk-Based Development — Maximum Speed Small frequent merges to main Feature flags hide incomplete work Best for: mature DevOps teams with strong CI/CD 5️⃣ Feature Branching — The Baseline One branch per feature Merge when done Best for: teams still defining their workflow 🎯 The real rule: Match your branching strategy to your deployment frequency. Deploy 10 times a day? → Trunk-Based or GitHub Flow Deploy once a month? → GitFlow gives control Deploy after compliance approval? → GitLab Flow The best Git strategy is the one your team can follow without holding meetings about the strategy. 💬 What branching strategy does your team use — and why? #SoftwareEngineering #Git #DevOps #CodingTips #TechLeadership #GitFlow #CICD #DeveloperTools #EngineeringCulture #BestPractices

Day 11 of My #30DaysOfTech Journey at TS Academy Today I learned about Git Branching and Merging — one of the most powerful features of Git. Branching allows developers to work on new features without affecting the main project. Instead of modifying the main code directly, you create a separate branch, work on it, and merge it back when it’s ready. Commands I practiced: 1. git branch → View branches 2. git branch feature1 → Create new branch 3. git checkout feature1 → Switch to branch 4. git switch feature1 → Modern way to switch 5. git merge feature1 → Merge branch into main Why branching is important in DevOps: Multiple team members can work simultaneously Reduces risk of breaking production code Supports CI/CD workflows Enables testing before deployment This is heavily used on platforms like GitHub, where teams collaborate through pull requests and code reviews. Today I understood something important: DevOps is about controlled change, not chaotic change. Branch → Test → Merge → Deploy. Slowly thinking like a real DevOps engineer #30daysOfTech #DevOps #Git #LearningWithTS #TechJourney