Page Comparison

...

Run Git Merge Sync

1. Navigate to Tasks and open the created salesforce git merge sync task.

2. Click Run Task.

   

3. In the Salesforce Git Merge Task Wizard popup, click Start a New Instance to proceed with a new instance.

4. 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.

5. Under File Comparison and Selection, provide any file selection rules and click Proceed with [# of] file(s).

6. 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.
   

   Image Added

7. 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.
   

   

8. 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.

9. Confirm your selections and click Trigger Merge Sync Task to merge your selections.

...