Deployments

Intermediate

Admin, Developer, and Team Leader

The feature branch model

Understand and master the feature branch model for Salesforce DevOps, enhancing your collaborative development process.

A Salesforce DevOps course

Course introduction

The feature branch course introduces the feature branch model, a structured Git branching approach tailored specifically for Salesforce DevOps. You’ll learn how feature branches enable multiple developers to collaborate effectively by isolating their work from the main branch, resolving merge conflicts proactively, and streamlining the development process.

Whether you’re new to Git branching or looking to optimize your current workflow, this course equips you with the best practices and skills to manage feature branches confidently.


Who is the feature branch course for?

Admins, Developers, Team Leaders

This course is designed for Salesforce admins, developers, and release managers seeking a structured Git branching strategy. No previous Git experience is required — just a readiness to streamline your development workflow using proven branching techniques.

What you’ll achieve with the feature branch course

  • Understand the feature branch workflow
  • Learn how to manage feature branches separately from the main codebase
  • Understand how to handle hotfix branches for rapid issue resolution, clearly distinguishing between reverting features out of master for major issues and rolling fixes forward for minor, quickly addressed bugs
  • Explore how to use pull requests effectively for streamlined code reviews
  • Learn how to resolve merge conflicts effectively
  • Understand the benefit of multiple developers working on the same code simultaneously

What the feature branch course includes

This course covers the complete lifecycle of the feature branch workflow, from branch creation, commits, merging and deployment, providing practical, actionable insights. You will:

  • Understand the fundamentals of the feature branch workflow — Learn how feature branches differ from other types of branches, and why isolating changes from the main branch is essential.
  • Master Git branching techniques — Gain confidence in creating branches, naming conventions, tracking branches, and organizing your Git repository effectively.
  • Learn how to manage hotfix branches — Quickly create and merge dedicated branches for urgent fixes without disrupting the release branch.
  • Explore pull requests and code reviews — Use pull requests to systematically review code and reduce merge conflicts before integrating changes back into the master or main branch.
  • Streamline collaboration — Coordinate efforts across multiple developers, handle different branches effectively, and regularly sync changes to a central repository with Git push.
  • Record releases systematically — Maintain clear and consistent practices for recording releases using release branches, ensuring accurate version tracking and simplified deployment.

Feature branch course content

What is the feature branch model?

Learn the core concepts of the feature branch workflow, including how separate branches support parallel development. Understand key terms such as the main branch, feature branches, and hotfix branches, and why each has a crucial role in Salesforce DevOps.

Git branching strategy essentials

Explore essential Git branching strategies and techniques, including creating new branches, selecting meaningful branch names, and using dedicated branches for tracking different tasks. By mastering these practices, you’ll ensure your development process remains efficient and organized.

Managing multiple branches

Understand how to effectively manage multiple individual branches and minimize merge conflicts by keeping feature branches short-lived. You’ll learn techniques for coordinating multiple developers, using code reviews and pull requests strategically, and maintaining a clean main codebase.

Implementing a successful feature branch workflow

Gain practical knowledge on implementing the feature branch workflow within your central repository, emphasizing a structured development process, regular Git push updates, and thorough recording of releases.

Deploying feature branches

Discover best practices for deploying feature branches safely and efficiently. Understand the role of the release branch, learn how to merge branches back into the main or master branch smoothly, and explicitly follow the deployment process from master to staging environments, ensuring thorough testing at each stage before final production deployment.

Feature branch course final assessment

Validate your understanding of the feature branch model. This final assessment will test your knowledge of Git branching, feature branches, merge conflict resolution, and effective development workflows. Successfully completing this assessment earns you a certificate to showcase your expertise.

Other DevOps Launchpad courses you might be interested in

FAQs

What is DevOps Launchpad?

DevOps Launchpad is a free training platform packed with courses and resources for anyone in the Salesforce ecosystem looking to upskill in Salesforce DevOps.

The certifications, courses, and quizzes on DevOps Launchpad are curated by experts in the field from Gearset, the leading DevOps platform for Salesforce. But the majority of content on DevOps Launchpad is all vendor-neutral, and useful for anyone learning more about Salesforce DevOps.

Who is DevOps Launchpad for?

Anyone involved in any aspect of the build, test and release cycle for Salesforce – it doesn’t matter if you’re brand new to the ecosystem or more experienced in Salesforce development.

Our courses are designed to upskill everyone in DevOps, regardless of role. Whether you’re an admin, a developer, an ISV partner or a technical architect, there’s something here for you.

How do I complete courses and get certificates?

DevOps Launchpad courses are broken down into modules. To finish a module, you usually complete a quiz to test your knowledge with multiple-choice questions. Once you finish all the modules in a course, you’ll earn a certificate which can be downloaded and saved to your resume, or shared on your social profiles.

How do I navigate the platform?

Click the Courses tab to see the courses and certification tracks that you’ve enrolled for. This page will be blank until you choose courses in the library. If you want to return to a course in progress or one that you’ve previously completed, head to this page.

The Results tab shows your progress through the courses you’ve completed, including any certifications and test results. It’s a great way to track your learning journey and see the skills you’re building.

The Library is where you can browse courses and enrol to continue building your skillset. Once you enrol for a course, it’ll be added to your courses page and you can start working through it.

How do I access my account?

You can access DevOps Launchpad in different ways:

Do I have to complete the feature branch course all in one go?

No, you can take modules and courses in your own time. Your progress will be saved, so you can come back whenever suits your schedule!

Do I get a certificate for the feature branch course?

You will receive a certificate for each course that you complete. After you have completed all the courses and the final assessment, you will be awarded the official final certification.