Support for consistent merge
Ulf Asklund, Boris Magnusson · Lund University Publications (Lund University) · 2000
In this paper we discuss a powerful way to support merge of concurrently developed documents (such as programs). Existing merge tools require the user to decide for each individual change if it should be included or not. We show how it is possible to let the user to decide to include (or exclude) several changes in one go. In our prototype we use the structure of the document in order to support the user in making consistent merge decisions.