# DevOps: Day 13 - Git branching strategy Branching strategy is where you have various branches such as: - Master Branch: kept for active development. - Feature Branch: used to introduce new breaking changes. - Release Branch: the branch where our application is built from. Runs end to end functionality test from this branch. So This branch is used to test before releasing to the customer whenever a feature is ready to be released. So here the development work is done, hence it is separated from the master because there will still be active developments going on in the master branch. Which we don't want in the release branch. Release always happens from the release branch. Note: There can also be Bugfix/Hotfix in Git Branching Strategy, just that those are usually short-lived. #DevOps #Tech #git #github #gitbranch #master #feature #release
Gideon Bature’s Post
More Relevant Posts
-
In real-time projects, Git is our best friend — but sometimes it becomes a puzzle! Here are some common Git issues teams face in day-to-day DevOps work 👇 🚫 Merge Conflicts — when multiple people change the same file or line. 💥 Detached HEAD State — happens when you checkout a commit instead of a branch. 🔁 Rebase gone wrong — leads to overwritten commits or lost changes. 🕵️ Wrong branch commits — pushing code to main instead of your feature branch. 🔒 Permission errors — while pushing or pulling due to access or SSH key issues. ✅ Tip: Always take a backup branch before doing a rebase or reset, and pull the latest changes before committing. Git is powerful — mastering it saves hours in debugging and helps maintain clean version control in any DevOps pipeline. #Git #GitHub #DevOps #VersionControl #CICD
To view or add a comment, sign in
-
Day 126 🧩 Multi-branch Pipelines Git + Jenkins Magic That Was Worth Every Minute Today’s DevOps lesson felt like unlocking a secret CI/CD superpower I finally learned how to use multi-branch pipelines in Jenkins, and wow… this changes everything. ⚡ Instead of manually configuring pipelines for main, dev, or feature branches, Jenkins now automatically: ✅ Detects every new branch ✅ Creates separate pipelines per branch ✅ Runs builds based on their respective Jenkinsfile rules ✅ Keeps environments cleaner and more controlled Here’s the impact: 🔹 Feature branches now build and test in isolation — no accidental impact on main. 🔹 Each branch can have its own environment logic if needed. 🔹 No more updating one giant pipeline for every change. 🔹 CI/CD now truly follows Git workflow, just the way it should. It felt like upgrading from a single lane road to a multi-lane highway with automatic traffic control. 🚦 💡 Lesson: Branching strategies are only effective when your CI/CD understands them and multi-branch pipelines make that happen. #1000DaysOfDevOps #Day126 #Jenkins #DevOps #CICD #Git #Automation
To view or add a comment, sign in
-
-
💡The .gitignore file in Git helps you keep your repo clean by excluding unnecessary files like logs, temporary files, build outputs, or system-generated files from being tracked. It’s a simple yet powerful way to maintain a professional and clutter-free project repository. 🚀 #DevOps #Git
To view or add a comment, sign in
-
🔄 Day 27 of #100DaysOfDevOps — Reverting Commits in Git “Failure is simply the opportunity to begin again, this time more intelligently.” – Henry Ford Today’s task was all about damage control in Git — something every DevOps engineer eventually faces. Here’s the scenario: The Nautilus application development team encountered an issue with the latest changes pushed to the repository located at: 📍 /usr/src/kodekloudrepos/demo on the Storage server in Stratos DC. The development team needed the repository rolled back to the previous stable commit. As part of the DevOps team, it was my job to: Identify the latest commit (HEAD) that introduced issues. Revert the repository to the previous commit, which contained the initial stable codebase. Create a new revert commit with the message revert demo message to document the rollback cleanly. This exercise reinforced why version control isn’t just about committing code, but also about managing mistakes gracefully. A well-structured revert ensures that the project history stays intact while swiftly neutralizing any bad changes. In real-world CI/CD pipelines, knowing how to revert without disrupting collaborators is a critical operational skill. It maintains velocity while preserving integrity. #100DaysOfDevOps #Day27 #Git #VersionControl #GitRevert #DevOpsJourney #ContinuousLearning #TechCommunity #SoftwareEngineering #InfrastructureManagement #GitOps #CodingJourney #ProfessionalGrowth #EngineeringExcellence #CommandLine #DevOpsCulture #ErrorRecovery #Teamwork #OpenSource #CloudComputing #TechGrowth
To view or add a comment, sign in
-
-
DevOps Day 26: Git Branching Explored Git branching today — a way to work on features or fixes independently without disturbing the main code. Makes collaboration and code management much easier! #DevOps #Git #VersionControl #LearningJourney
To view or add a comment, sign in
-
What Is a Branching Strategy in Git? (2025 Guide) 💡 Ever pushed directly to main and instantly regretted it? 😅 It’s time to get serious about Git Branching Strategies the backbone of modern DevOps, CI/CD, and code collaboration. In this new 2025 guide, we break down how branching defines your entire workflow from hotfixes to release pipelines. 🔹 Learn about: Git Flow vs. GitHub Flow vs. Trunk-Based Development When to merge, when to rebase, and when to hold off Feature branching & environment-based branching Best practices for enterprise CI/CD alignment Tools to automate merge approvals & pull requests 🧠 A strong branching strategy isn’t just for version control . it’s about speed, stability, and scalability in your delivery lifecycle. 📘 Read the complete guide: https://lnkd.in/dCHhU_mP #Git #BranchingStrategy #DevOps #VersionControl #GitHub #GitLab #CloudComputing #SoftwareEngineering #CodeManagement #ContinuousIntegration #ContinuousDelivery #DeveloperTools #CodeReview #CICD #Automation #OpenSource #TechCommunity #PlatformEngineering #Programming #SoftwareDevelopment #AgileDevelopment #SRE #CodingBestPractices #InfrastructureAsCode #CloudEngineering #LinuxCloud #TechInnovation #EngineeringCulture #BuildAutomation #DeveloperProductivity
To view or add a comment, sign in
-
-
🔧 DevOps Guide: Common Git Errors & Solutions 🔧 Struggling with Git errors? Here's your troubleshooting guide to the most common Git challenges! 🚨 Top Git Errors & Quick Fixes: 1. Repository Issues: • "Not a git repository" → Solution: git init or check directory 2. Push/Pull Problems: • "Failed to push some refs" → Solution: git pull --rebase first 3. Merge Conflicts: • "Automatic merge failed" → Solution: Resolve conflicts manually, then commit 4. Authentication Errors: • "Permission denied" → Solution: Configure SSH keys or tokens 5. Branch Issues: • "Cannot delete branch" → Solution: Merge/push changes first 💡 Pro Tips: • Always pull before pushing • Keep branches up-to-date • Use SSH over HTTPS • Check git status frequently • Maintain clean working trees 🎯 Remember: Git errors are learning opportunities, not roadblocks! 💬 What's your most challenging Git error? Share below! #Git #GitHub #DevOps #TroubleShooting #DevOpsEngineering #GitCommands #SoftwareDevelopment #TechSupport #CodeManagement #VersionControl
To view or add a comment, sign in
-
🧰 Essential Git Commands Every DevOps Engineer Uses Daily Git isn’t just about commits — it’s about control, traceability, and teamwork. Here are some commands that keep every DevOps pipeline flowing smoothly 👇 💡 Daily Git essentials: git clone <repo> # Copy a repository git status # Check changes git add . # Stage everything git commit -m "Message" # Save your work git push origin main # Share with the world git pull origin main # Get latest updates git log --oneline --graph # Visualize commit history git diff # See what changed git stash / git stash pop # Save or restore temporary work git checkout -b <branch> # Create & switch branch Small commands. Big impact. 🚀 Because in DevOps, version control = peace of mind. 😌 #Git #DevOps #VersionControl #GitHub #Coding #OpenSource #TechEducation #DeveloperTools
To view or add a comment, sign in
-
🚀 Day 52 of My #100DaysOfDevOps Challenge Today’s topic: Git – Cherry Pick 🍒 While exploring Git, I learned about the cherry-pick command — an extremely useful feature that allows you to select a specific commit from one branch and apply it to another. It’s like copying a particular change without merging the entire branch! 🔹 What Cherry-Pick Does: When you cherry-pick a commit, Git recreates that commit on your current branch with the same changes but generates a new commit ID. 🔹 How It Works: Each Git commit is identified by a SHA-1 hash, which is generated based on: Commit content Metadata (author, timestamp) Parent commit(s) Here’s what happens during cherry-pick: Identify the Commit: Git locates the commit using the provided hash. Generate a Patch: It calculates the differences (diff) introduced by that commit. Apply the Patch: Git applies those differences to your current branch. Create a New Commit: A new commit is created with a new hash reflecting the applied changes. This helps developers move specific fixes or features between branches without merging unnecessary commits — a true productivity booster! ⚡ 🔗 https://lnkd.in/diGhH4R7 📌 GeeksforGeeks #SkillUpWithGFG #nationskillup #DevOps #Git #VersionControl #GitCherryPick #LearningJourney #SoftwareDevelopment #Productivity
To view or add a comment, sign in
-
-
Day 35 of #100DaysOfDevOps — Wrapping Up Git with Git Hooks! Today marked the final Git lesson in my DevOps journey so far — and it was all about Git Hooks What I did: Merged a feature branch into the master branch Created a post-update hook that automatically creates a release tag (e.g., release-2025-10-25) whenever changes are pushed to the master branch Tested the hook and verified the tag creation This was the perfect way to end the Git series — automating tasks at the repo level to ensure smooth CI/CD workflows Quick Recap of What I’ve Learned in Git So Far: ✅ Initializing and cloning repositories ✅ Staging, committing, and pushing changes ✅ Working with branches and merges ✅ Reverting and resetting commits ✅ Using stash to save temporary work ✅ Rebasing for a clean linear history ✅ Resolving merge conflicts ✅ Cherry-picking specific commits ✅ Setting up Git Hooks for automation Git has been a powerful foundation for version control and collaboration — next up, we dive into Docker, where we’ll start containerising applications! #100DaysOfDevOps #DevOps #KodeKloud
To view or add a comment, sign in
More from this author
Explore related topics
Explore content categories
- Career
- Productivity
- Finance
- Soft Skills & Emotional Intelligence
- Project Management
- Education
- Technology
- Leadership
- Ecommerce
- User Experience
- Recruitment & HR
- Customer Experience
- Real Estate
- Marketing
- Sales
- Retail & Merchandising
- Science
- Supply Chain Management
- Future Of Work
- Consulting
- Writing
- Economics
- Artificial Intelligence
- Employee Experience
- Workplace Trends
- Fundraising
- Networking
- Corporate Social Responsibility
- Negotiation
- Communication
- Engineering
- Hospitality & Tourism
- Business Strategy
- Change Management
- Organizational Culture
- Design
- Innovation
- Event Planning
- Training & Development