Software Configuration Management

Automatic Inter-branch Merging (Integration) For Perforce

Introduction

Software organizations use branches to isolate changes made to codebase in order to support concurrent software development. Commonly seen types of branches are release, development and private branches.

Problem Of Growing Number Of Branches

Growing number of branches leads to significant degradation of performance of a software organization because the organization has to spend increasing time merging instead of delivering new functionality and bug fixes.

Viewtier Automerge

Automerge solves the problem of the growing number of branches. Unlike the simple automatic merging, Automerge does not have the problem of semantically incorrect merges. Automerge performs merging by using a new, ground-breaking, technology, developed by Viewtier that we call "verified automatic merge". Built on top of Parabuild, it works as described below.

Features

Web User Interface

Automerge has a Web UI that shows what is merged and what is not, also known as integration report, and status of the automatic merge queue.

All Automerge configuration is done through the Web user interface as well.

Getting Started

Check this technical note to get started with Automerge.