Git Branching and Merging Strategies
Master Git branching and merging by implementing a feature branch workflow for a web application project.
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)
🟡 Beta bootcamp lab. Hands-on instructions, check scripts, and solve scripts are in place. Lab is part of the running TaskFlow project that grows across all 21 weeks of the bootcamp.
This hands-on lab teaches Git branching strategies through practical implementation.
You'll learn to:
- Create and manage feature branches
- Implement feature branch workflows
- Handle and resolve merge conflicts
- Understand rebasing vs merging
- Use git stash for work-in-progress changes
- Apply branch naming conventions
Perfect for developers learning professional collaboration workflows and version control strategies.
What You'll Learn
Create and manage feature branches following naming conventions
Implement the feature branch workflow for isolating changes
Understand the difference between merge and rebase strategies
Use git stash to save and restore work in progress
Prerequisites
git-fundamentals
basic-git
Technologies Covered
Choose your plan
Simple, Transparent Pricing
Unlock full access to TeKanAid courses, labs, and bootcamps
Pro
Course content without labs
Renews automatically. Cancel anytime.
Final price verified at checkout.
- Full access to all courses
- Progress tracking
- Certificate of completion
- Community access
- Bootcamp participation
- New content access
Premium
Full access with hands-on labs
Renews automatically. Cancel anytime.
Final price verified at checkout.
- Everything in Pro
- Unlimited hands-on labs
- 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 CoursesTry it free, no credit card
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