Selectively retrieve and merge the Salesforce components to a target branch using the Salesforce Git Merge Sync task. Once the task has been created, run it to select the metadata component types and using the Diff viewer, analyze and merge to bring in the changes. Opsera will push the code to the configured branch of the repository during the task execution. You can view the logs once the Salesforce Git Merge Sync has been triggered
In this section:
Create Salesforce Git Merge Sync Task
Run Salesforce Git Merge Sync
View Git Merge Sync Logs
Create Salesforce Git Merge Sync Task
Login to Opersa, and navigate to Operations > Tasks.
Click New Task.
In the Create New Task popup, enter the following details.
Name: Enter a name for the task.
Type: Select Salesforce to Git Merge Sync from the dropdown.
Salesforce Source Branch Tool: Select the Salesforce organization from where the components will be merged to target branch.
Source Control Management Type: Choose whether a Bitbucket, GitHub, or GitLab repository contains the branch of the merge.
Account: Select the configured SCM tool.
Repository: Select the repository containing the git merge change.
Create New Target Branch - Toggle to merge changes to a new branch and provide an Upstream Branch.
Target Branch - Select the branch to which you want to merge the changes.
4. Click Create.
Once the task is created, you need to run the task to successfully merge the task.
Run Git Merge Sync
Navigate to Tasks and open the created salesforce git merge sync task.
Click Run Task.
In the Salesforce Git Merge Task Wizard popup, click Start a New Instance to proceed with a new instance.
Enter your desired From Date and To Date range. The Salesforce git merge you wish to sync should have occurred between these 2 date ranges. Under Component Types choose the components you wish to merge. Once done, click the Update Parameters and Proceed.
Under File Comparison and Selection, provide any file selection rules and click Proceed with [# of] file(s).
Under File Selection Rule Filter define any rules to apply to the source file(s) to filter results more accurately. The Source File Selection table will show the file that has been modified.
Under Merge Change Selection, use the Delta Diff Viewer to verify any changes to be merged. Here you can easily do a side-by-side comparison of the Existing Code on Destination Branch and the Incoming Changes. By default, the Merging Changes from Incoming Branch button is selected. You can choose to Keep Existing Changes on Destination Branch or Merging in Changes from Source Branch.
Once the diff selections have been made, click Confirm File Change Selections to confirm your selections, then click Confirm Merge Sync for…File(s) to proceed to final confirmation screen.
Confirm your selections and click Trigger Merge Sync Task to merge your selections.
View Git Merge Sync Logs
View the Task Activity Logs once the Salesforce Bulk Task has been triggered and is running to see the components that were retrieved and the total count against each component type. To view the console log, locate the Run number you want to monitor and click console log in the Log Type column.
