Git Branching and Merging Strategies
Master Git branching and merging by running a full feature branch workflow against your own TaskFlow fork.
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 hands-on lab teaches Git branching strategies by working directly on your own TaskFlow fork. You authenticate with GitHub, point your clone at your fork, and practice branch mechanics on a real repository - then add a small docs change and push it.
You'll learn to:
- Authenticate with GitHub and point a clone at your own fork
- Create, switch, rename, and delete branches
- Apply branch naming conventions and track a branch upstream
- Run the feature branch workflow and merge with fast-forward and 3-way merges
- Commit a real docs change and push it to your fork
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
Merge feature branches using fast-forward and 3-way merge strategies
Delete branches safely and force-delete unmerged branches
Prerequisites
git-fundamentals
basic-git
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
- Self-paced bootcamps
- Premium puzzle library not included (5 free puzzles available)
- 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)
- Full access to the puzzle library
- Lab AI Assistant
- 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