Day 32: Git Rebase
🔀 Day 32: Git Rebase | 100 Days of DevOps
Welcome to Day 32 of the 100 Days of DevOps series! In this lab, you’ll learn how to use Git Rebase to update a feature branch with the latest changes from the master branch—without creating a merge commit.
The Nautilus development team wants to keep a clean commit history while incorporating the latest updates from master into the feature branch.
📌 Lab Objective:
Rebase the feature branch onto master and push the updated history.
🛠️ Task Requirements:
Repository: /usr/src/kodekloudrepos/cluster
Rebase feature branch with master
Do NOT create a merge commit
Preserve all feature branch changes
Push updated branch to remote
💻 Step-by-Step Commands:
🔹 1. Navigate to Repository
cd /usr/src/kodekloudrepos/cluster
🔹 2. Check Branches
git branch
🔹 3. Switch to Feature Branch
git checkout feature
🔹 4. Rebase with Master
git rebase master
➡️ This replays feature branch commits on top of latest master.
🔹 5. Resolve Conflicts (if any)
If conflicts occur:
Fix files manually
git add .
git rebase --continue
To abort if needed:
git rebase --abort
🔹 6. Push Changes (Force Required)
git push origin feature --force
🔍 Verify History:
git log --oneline --graph
✅ Expected Outcome:
Feature branch updated with latest master changes
No merge commit created
Clean linear commit history
Changes successfully pushed to remote
📚 What You’ll Learn in This Video:
What Git Rebase is and how it works
Difference between merge vs rebase
Maintaining clean commit history
Handling conflicts during rebase
Safe use of force push
Real-world DevOps Git workflows
🌟 Why This Lab Matters:
Rebasing is essential for keeping project history clean and readable, especially in collaborative environments where multiple developers are working on different features.
🎯 Series: 100 Days of DevOps
Continue mastering Git, Linux, Docker, Kubernetes, and Cloud with real-world labs.
🔔 Don’t forget to like, share, and subscribe for more tutorials from OtterTech!
#DevOps #Git #GitRebase #VersionControl #OpenSource #SoftwareDevelopment #Nautilus #100DaysOfDevOps #OtterTech #Day32