This document will provide an overview of the workflow followed for Git Merge feature where components will be merged/synced from SFDC Org to Git branch.

How to create Task

Login into Opsera portal & click on “Tasks” option from the left menu

Upon clicking on the “Tasks” menu, it will show the Opsera Task Management screen

Click on “ New Task “ and it will open a window to configure the Task.
Enter Name, Description, Tags [any], Type – SFDC Org Sync

Once you select the type as “SFDC Org sync”, it will open up the rest of the fields to be configured.

Jenkins tool	Shows all Jenkins Tool from Tool Registry - Select one
SFDC Account	Shows all SFDC Account from Tool Registry - Select one
Repo Account	Shows git account added in Jenkins tool from Tool registry
Repository	Select repo from Git account
Branch	Select Branch where changes to be merged

Once above all fields are selected, click on “ Create GIT Task “ from the right bottom, to finish creating the task.

Now, GIT Task has been added successfully (As shown below)

Click on ⬅ “ Go back” icon to navigate to the table view to view the newly created GIT Task.

How to run a successful GIT Merge task

On the git task table view→click on ‘Run Task’ button

Click on ‘Confirm’ on the confirmation dialog box

Select the date and components→click on ‘Next’ button

On SFDC Files tab→shows the modified files list

Select the modified files whichever needed for merging

Click on ‘Proceed’ button on the Package XML page

Git task will start to run and merge with a message ‘request to start this task has been submitted’

Click on Activity Logs → where Git task run logs will be captured

Once Merge is successful → ‘Git Merge Action: Sync up successful’ message will be displayed

SFDC Org and Git branch – Modified files should be in Sync now (as shown below)

SFDC Org

Git Branch

Merge Conflict Scenario

If there is a conflict, a Pull Request will be automatically created and PR link will be captured in the Git task Logs for user action

Resolving Conflicts from GitHub UI

Open the Pull Request Link and click on Resolve Conflicts.

The conflicts will be displayed on screen.

Resolve the conflicts and click on Mark as Resolved.

Click on Commit Merge to push the changes as part of the Pull Request.

Merge Pull Request will be enabled and Pull Request can now be merged.

Resolving Conflicts from GitLab UI

Open the Pull Request Link and click on Resolve Conflicts.

Click on either Interactive Mode or Edit Inline option to edit the files for resolving conflicts and click on Commit to source branch to push the changes as part of Pull Request.