Program Merge header - safe merge diagram

Future of Program Merge

微软研究院博客

An illustration of resolving a bad merge into a safe merge. Moving from left to right, circles on a continuous line represent code commits in a version control system. A circle labeled “Base” is the most common ancestor of the commits marked A and B, respectively. All three commits pass the project’s quality gates, denoted by green check marks alongside each of these commits. The subsequent merge results in a failure of some quality gate, denoted by a blue circle labeled “Bad merge” with a red x above it. The repair uses machine learning, denoted by an abstract image of a neural network, and program verification and synthesis, denoted by a formal inference rule containing math symbols, to construct a safe merge that passes the quality gate, denoted by a circle outlined in green with a green check mark above it.   
微软研究院博客

| Shuvendu Lahiri

Since the computing world began embracing an open-source approach to programming, building software has become increasingly collaborative. Members of development teams with as few as two developers and as many as thousands are simultaneously editing different components in creating software…