Description: Use this task to selectively merge changes from a source branch to a target branch.
Prerequisite: Repository is connected to the configured SCM tool for task creation and run.
| Table of Contents | ||||
|---|---|---|---|---|
|
Git to Git Merge Sync Task Configuration
Navigate to Tasks and create a new task. Select Git to Git Merge Sync from the Type drop-down.
2. Provide the following required fields for the task:
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.
Source Branch - Select the branch you wish to merge from.
Create New Target Branch - To merge changes to a new branch, enable the toggle and provide an Upstream Branch.
Target Branch - Select the branch to which you wish to merge the changes.
3. Click the Save button and proceed to run the task.
Git to Git Merge Sync Task Run
Click Run the Task to enter the Git to Git Merge Sync Wizard.
Click Start a New Instance to proceed with a new instance.
3. Enter your desired From Date and To Date range. The git merge you wish to sync should have occurred between these 2 date ranges. After you enter dates and times, click the Update Parameters and Proceed button.
4. File Comparison and Selection: Provide any file selection rules and click the Proceed with [# of] file(s) button.
File Selection Rule Filter - Provide 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.
5. Commit Comparison and Selection:
Using the Delta Diff Viewer, 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.
Note:By default, the Merging Changes from Incoming Branch button is selected.
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.
6. Confirm your selections and click Trigger Merge Sync Task to merge your selections.
Git to Git Merge Sync Task Activity Logs
