Skip to main content
AutoRABIT, Inc.

New Merge

New Merge allows user to perform merge operation between two branches from a repository.

To perform merge changes:

  1. Go to the AutoRABIT Homepage.
  2. In Version Control, select New Merge. The following screen is displayed.

vc-030.png

  1. In Repository field, select a repository.
  2. From Branch: Select the branch from which the changes have to be moved.
  3. To Branch: Select the branch into which the changes have to be moved.
  4. In Merge Type, you have four options:
    1. Entire Branch: You can merge an entire branch to a different Branch
    2. Single Revision: You can merge a Single Revision from the Commits you have performed
    3. Commit Labels: You can select the Commit Labels created while committing to Version Control System.
    4. Release Labels: You can select the Release Labels created using the committed Revisions as well as the Labels
  5. Conflict Resolution Strategy field allows you to select the way you want to resolve the conflicts. By default, you can select either of the three options:
    1. Manually resolve conflicts: You can resolve the conflicts manually in the merge screen
    2. Choose file from source: Allows you to choose from source to resolve the conflicts
    3. Choose file from destination: Allows you to choose from destination to resolve the conflicts

  1. Give a Merge Label Name.
  2. Enter comments about the Merge Operation performed in the Comment field.
  3. Enter the email id(s) to send the merge reports.
  4. Click Dry Run, to validate the merge. The label is displayed in the Merge History page as Merged_Not_Committed.
  5. Click Merge, and the label is updated in the Merge History page. The Merge reports gets generated and the same gets triggered to the given mail id.​​​​​​​

 

Iconic Representation for New Merge as below:

Icon Description

Repository drop down allows you to select the Repository registered with AutoRABIT

From Branch drop down allows user to select the branch from which the commits need to be merged

To Branch drop down allow user to select the branch to which the commits to be merged from another Branch.

Merge Type drop down allows you to select the type of Merge you want to proceed with

Conflict Resolution Strategy allows you to select the way you want to resolve the conflicts

Merge Label Name allows user to give a name to their merge operation

Comment allows you to enter comments/description about the merge operation performed

Dry Run allows you to do a virtual merge and does not commit the merge

Merge allows you to a real time Merge and commit it to the Version Control System

  • Was this article helpful?