Git Merging, Rebase, and Stash
Create and resolve merge conflicts, apply rebasing techniques, and master git stash and cherry-pick for professional Git workflows.
Lab Overview
🛠Lab from the Platform Engineering Bootcamp. Used in Week 3. Bootcamp landing page: https://academy.tekanaid.com/bootcamps/platform-engineering-bootcamp Parent course(s):
- Week 3: Git, GitHub & CI/CD Fundamentals (slug: git-github-cicd-fundamentals)
This lab continues Git Branching and Merging by covering conflicts, rebase, and advanced history management - all on your own TaskFlow fork. You authenticate with GitHub, point your clone at your fork, then engineer and resolve conflicts on disposable branches so main is never left broken.
You'll learn to:
- Authenticate with GitHub and point a clone at your own fork
- Engineer and resolve merge conflicts by hand and with git's --ours/--theirs and --abort tools
- Rebase a feature branch for a clean linear history
- Apply git stash to save and restore work in progress, including multiple stashes
- Cherry-pick a specific commit across branches and push your work to your fork
Builds on Git Branching and Merging Part 1 and prepares you for GitHub collaboration workflows.
What You'll Learn
Create and resolve realistic merge conflicts in team scenarios
Use git rebase to rewrite and clean up commit history
Apply git stash to manage work in progress across branches
Cherry-pick individual commits and apply them to target branches
Prerequisites
git-fundamentals
git-branching-merging
Technologies Covered
Choose your plan
Simple, Transparent Pricing
Unlock full access to TeKanAid courses, labs, and bootcamps
Just exploring? Start free below. Want the full experience? Try Premium free for 7 days (card required, $0 today).
Pro
All courses, with lab scripts to run on your own machine
Renews automatically. Cancel anytime.
Final price verified at checkout.
- Full access to all courses
- Lab scripts to download and run on your own machine (hosted labs not included)
- Progress tracking
- Certificate of completion
- Community access
- Bootcamp participation
- New content access
Premium
Full access, including unlimited hosted labs
Renews automatically. Cancel anytime.
Final price verified at checkout.
- Everything in Pro
- Unlimited hands-on labs, fully hosted on TeKanAid Academy (nothing to set up)
- Lab AI Assistant
- Accelerator bootcamps with live office hours
- Priority support
Prefer a single course?
Purchase individual courses for a one-time fee of $79. Full access to course content, quizzes, certificates, and community features, lab access is not included.
Browse CoursesJust exploring? Start free, no account needed
Three free ways to start. All bridge into the paid Premium catalog when you're ready.
Not ready to commit? The crash course is email-only. No academy account required.
Ready to Get Started?
Start this hands-on lab and build real-world Platform Engineering skills
Get Access Now