Skip to main content
AutoRABIT, Inc.

Merge History

Merge History displays the entire history of merges done by a user and detailed log of the Merge Operation performed based on Repository and Branch selection. It even allows you to trigger a New Merge.

  1. Click on the filter icon vc-024.png to search specific merges based on certain criteria.

vc-020.png

  1. You can view:
    1. Merge Summary
    2. Merge Report
    3. Merge Log

 Merge Summary (vc-026.png)

Click on the summary icon vc-026.png to view details of the merge.

 

Merge Report (vc-027.png)

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. A report will not be generated if the merge is already up to date or if it’s in progress.

To resolve the conflicts of a merge:

  1. Go to the required Label and click Report to see a list of conflicted files and merged files in the window.
  2. Now select a conflicted file that has to be resolved.
  3. Select the conflict from the list of conflicts. Navigate among the conflicts by using Prev Conflict and New Conflict.
  4. Now select an option to resolve the conflicted files:
    • Use Local File: Use local file to resolve the conflict
    • Use Remote File: Use remote file to resolve the conflict
    • Use this text block:
      • Local block to use a block of code from the Local file instead of the entire file
      • Remote block  to use a block of code from the Remote file instead of the entire file
    • ​​​​​​​Use text block from ‘mine’ before ‘theirs’:  Use text from local block first, then use text from the remote block
    • Use text block from ‘theirs’ before ‘mine’: Use text from remote block first, then use text from the local block
  5. ​​​​​​​Click Resolve to resolve the selected conflicted file.

 

Merge Log (vc-029.png)

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?