Method and system to automatically enforce a hybrid branching strategy

摘要

A method and system for automatically enforcing a hybrid branching strategy include receiving a changeset designated for a branch. In response to receiving the changeset, the system may automatically determine whether a merge conflict associated with the changeset exists between the branch and an associated protected branch, and the system may automatically determine whether the changeset is up to date. Upon determining that no merge conflict exists, the system automatically initiates execution of a continuous integration testing pipeline. The continuous integration testing pipeline includes a series of tests applied to the changeset. If the changeset passes the series of tests, the system automatically merges the changeset with the associated protected branch.

主权项

1. A method for automatically enforcing a hybrid branching strategy, the method comprising:
receiving, using at least one microprocessor of a computing device, a changeset from a source branch designated for a merge branch; in response to receiving the changeset, automatically determining whether a head conflict exists, the head conflict existing when the source branch lacks a latest changeset for the merge branch or lacks a latest changeset for a protected branch associated with the merge branch; upon determining that no head conflict exists, pushing the changeset to the merge branch and automatically initiating execution of a continuous integration testing pipeline, the continuous integration testing pipeline including a series of tests applied to the changeset; and if the changeset passes the series of tests, automatically merging the changeset with the associated protected branch.