Skip to main content
AutoRABIT, Inc.

New Merge

New Merge allows user to perform Merge Operation between 2 Branches from a Repository.

vc-030.png
 

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. Details are below

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 VCS

Merge Type:

This drop down allows you to select either of the 4 options which AutoRABIT Supports like:

  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 VCS.
  4. Release Labels: You can select the Release Labels created using the committed Revisions as well as the Labels


 

Conflict Resolution Strategy:

 

This drop down allows you to select either of the 3 options which AutoRABIT Supports like:

  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

  • Was this article helpful?