Skip to main content
AutoRABIT, Inc.

Merge History

Merge History

The Merge History lists every merge operation you've previously run through AutoRABIT.

It is also where you get detailed log of the Merge Operation performed based on Repository and Branch selection.

 

Accessing Merge History

You can access your merge history under the Version Control > Merge History menu.

9.png

The Merge history contains a list of all successful merge operation run through AutoRABIT. For each item, the following information is displayed:

  • Merge Label: Merge operation name.
  • Owner: You can view the owner who performed the merge operation.
  • Date: The date and time of the deployment.
  • Status: You can know the status of the merge operation
  • Actions: Several actions can be performed on any history item (see below)

 

Actions in Merge history

Several actions can be performed in the Merge History page.

  • New Merge
  • Merge Summary
  • Merge Report
  • Merge log

 

New Merge

New Merge allows you to trigger a new merge operation between two branches in a Version Control System. (For detailed info and working process, go to New Merge Section under Version Control Module)

 

Merge Summary

This contains key information about the merge operation, including the merge type, URL associated and the source and target branch to be deployed.

10.png

 

Merge Report

Sometimes you get merge conflicts when merging or pulling from a branch. A merge report gives a detailed report of the conflicting files that occur during a merge.

Note: Merge Report will not be generated if the merge is already up to date or if it’s in progress.

Go to the required Label and click Report to see a list of conflicted files and merged files in the window.

12344444.jpg

 

There are 2 ways to solve the conflicted files found in the Merge Report.
  1. Downloading the Conflicted files

AutoRABIT has given a provision to the user to download the conflicted files in their local machine, do the necessary changes and upload the same.

  1. On Merge History page, click on Report of the required Merge Label.
  2. On the next screen, select the files from the conflicted files list on the left panel.
  3. Click on the 2.png  icon to download the files. The files will be downloaded to your local machine in the zip- format. Work on the conflicted files and make necessary changes to it.
  4.  To upload the files, click on the 1.png  button and upload the files.

3.png

4.png

Note: 
1. You can upload a zip package containing many files up to a maximum of 100 MB. 
   If you attempt to upload a larger file, a notification prompt informs you that the file exceeds the limit. 
2. The file name and the folder structure should remain same as it is in the downloaded zip file.
  1. Once the file is uploaded, click on Verify.
  2. The next screen will show the resolved file status report. The file which is successfully uploaded and verified will only get merged to the destination branch.

5.png

  1. Last, click on Merged Resolved Files to commit the necessary changes to the destination branch.

 

B. Resolving in AutoRABIT Inline- Editor
  1. On Merge History page, click on Report of the required Merge Label.
  2. On the next screen, click on one of the conflicting files to see the errors. The following screen appears.

1234555822.jpg

  1. Navigate to other conflicts by using Prev Conflict and New Conflict.
  2. Next, choose an option to resolve the conflicted files:
    1. Use Local File: Use local file to resolve the conflict
    2. Use Remote File: Use remote file to resolve the conflict
    3. Use this text block from ‘local’ before ‘remote’: Use a block of code from the Local file, then use from the Remote file.
    4. Use this text block from ‘remote’ before ‘local’: Use a block of code from the Remote file, then use from the Local file.
  3. Click Resolve conflicts to resolve the selected conflicted file. At last, click Commit to commit the changes to the destination branch.

 

Merge Log

Click Log of a label to view the log of a merge activity.

 

Iconic Representation for Merge History home page as below:

Icon Description
vc-021.png

Refresh icon allows you to refresh the Commit history page without refreshing the entire browser

vc-022.png

Repository drop down allows you to select the Repository

vc-023.png

Branch drop down allows you to select the Branch

vc-024.png

Filter Icon allows you to search for a specific Merge based on created like From & To date and by Merged by.

vc-025.png

New Merge allows you to trigger a New Merge

vc-026.png

Icon  gives the summary of the Merge performed

vc-027.png

Icon gives the Report of the Merge performed based on status like MERGED_NOT_COMMITTED, FAILED & MERGED

vc-028.png

Icon notifies that there are Conflicts in the Merge

vc-029.png

Log icon gives the detailed log of the Merge Operation performed

Tags recommended by the template: article:topic

  • Was this article helpful?