How to deploy changes for two branches in Salesforce

Last Updated : 23 Jul, 2025

Managing multiple branches is a standard practice in Salesforce development, allowing teams to work on separate features or bug fixes simultaneously. Deploying changes from two branches can be challenging, particularly when ensuring that only the intended modifications are migrated. The sfdx-git-delta (SGD) plugin simplifies this process by analyzing differences between branches and generating delta changesets for efficient and accurate deployment.

This article provides a step-by-step guide to deploying changes for two branches in Salesforce using the sfdx-git-delta plugin, offering insights and practical examples for intermediate to advanced developers.

Branching in Version Control

Branching enables developers to work on isolated copies of code, facilitating independent development and collaboration. Common branches include:

  • Feature Branches: Used for developing new features or bug fixes.
  • Main/Master Branch: The primary branch representing the production-ready code.

Salesforce Deployment

Salesforce deployment involves migrating metadata components—such as custom objects, flows, or Apex classes—from one Salesforce instance or branch to another. Accurate deployment ensures that all required changes are transferred without unintended modifications.

Prerequisites for Deployment

Before deploying changes from two branches, ensure the following:

1. Installed Salesforce CLI (sfdx):

2. sfdx-git-delta Plugin:

  • The plugin analyzes Git differences and generates delta change sets. Install it using the steps outlined below.

Step-by-Step Deployment Guide

Step 1: Install the sfdx-git-delta Plugin

  1. Open your terminal and navigate to the Salesforce project repository.
  2. Install the sfdx-git-delta plugin:
sfdx plugins:install sfdx-git-delta

Step 2: Analyze Branch Differences

Use the sfdx-git-delta plugin to compare the two branches and generate a delta package.xml file. Replace feature-branch and master with the names of the branches you are working with.

sfdx sgd:source:delta --to feature-branch --from master --output out-directory
  • --to: The target branch containing the latest changes.
  • --from: The source branch (e.g., production or master).
  • --output: Specifies the directory where the generated package.xml file will be saved.

This command generates a delta package.xml file that contains only the differences between the two branches.

Step 3: Prepare the Package for Deployment

  • Copy the generated package.xml file to the manifest directory in your project root.
  • If the manifest directory does not exist, create it:
mkdir manifest
  • Ensure you are on the branch containing the latest changes before proceeding.

Step 4: Validate the Deployment

  • Validation ensures that the changes can be deployed without errors.
  • Run the following command to validate the deployment:
sfdx force:source:deploy -x ./manifest/package.xml --checkonly
  • -x: Specifies the path to the package.xml file.
  • --checkonly: Validates the deployment without applying the changes, ensuring all dependencies are met.

Step 5: Perform the Deployment

  • If validation succeeds, proceed with the actual deployment:
sfdx force:source:deploy -x ./manifest/package.xml
  • Monitor the terminal output for any errors or warnings during the deployment.

Tips for Managing Branch-Based Deployments

1. Ensure Branch Integrity:

  • Always pull the latest changes from the source and target branches before generating the delta.
git pull origin feature-branch
git pull origin master

2. Test Thoroughly:

  • After deployment, test the components in the target environment to ensure functionality.

3. Handle Conflicts Early:

  • Resolve merge conflicts in Git before generating the delta changeset. This avoids deployment errors caused by inconsistencies.

4. Use a Sandbox for Validation:

  • Deploy the changes to a sandbox environment before deploying to production.

Example Workflow: Feature Deployment to Production

Imagine you are deploying changes from a feature-branch to the master branch in a Salesforce project.

  • Generate Delta Changeset:
sfdx sgd:source:delta --to feature-branch --from master --output out-directory
  • Copy Package XML: Move the generated package.xml to the manifest directory.
  • Validate Deployment:
sfdx force:source:deploy -x ./manifest/package.xml --checkonly
  • Deploy to Sandbox:
sfdx force:source:deploy -x ./manifest/package.xml -u SandboxAlias
  • Deploy to Production (after successful testing):
sfdx force:source:deploy -x ./manifest/package.xml -u ProductionAlias

Benefits of Using sfdx-git-delta Plugin

  • Efficiency: Automates the generation of delta changesets, saving time and reducing errors.
  • Accuracy: Deploys only the changes made between branches, minimizing unintended modifications.
  • Flexibility: Supports multiple branches and environments, making it ideal for complex development workflows.
  • Integration: Seamlessly integrates with Git, leveraging its capabilities for version control and branch comparison.

Conclusion

Deploying changes for two branches in Salesforce requires careful planning and execution. By leveraging the sfdx-git-delta (SGD) plugin, developers can simplify this process, ensuring accurate migration of metadata components. The plugin’s ability to analyze Git differences and generate delta changesets streamlines the deployment workflow, reduces manual effort, and minimizes the risk of errors.

By following the steps outlined in this guide—installing the plugin, generating a delta package.xml, validating the deployment, and deploying the changes—you can efficiently manage multi-branch deployments in Salesforce. Always test thoroughly after deployment to ensure the integrity of the changes. Using tools like sfdx-git-delta, developers can optimize their workflow, enhance collaboration, and maintain high-quality Salesforce deployments.

Comment

Explore