New branch view

As part of our ongoing work to improve Branching & Merging in mabl, we've recently released the new Branch Details page. This page provides a summary of changes made on the branch including:

  • The current version of the development branch along with the author and timestamp
  • The current version of the master branch along with the author and timestamp
  • Steps changed on the development branch compared to the master branch
  • Warning of potential conflict if changes have been made on master since branching off

The user will be presented with a warning modal with the suggestion to resolve the conflicts if they try to merge a branch that has potential conflicts. At this time, the only way to resolve conflicts is to view the differences between the two versions and reconcile manually in the trainer. Further improvements for resolving conflicts are on the way!

Branch Details PageBranch Details Page

Branch Details Page