With the introduction of Multi-version module in Drupal 8 we suddenly have a very powerful content revision API that can handle branching and conflict DETECTION. But there is not yet a way to SOLVE revision conflicts. The proposed solution is to create PHP library which would find lowest common ancestor(LCA) from DAG and perform a recursive 3 way merge with LCA as base file. The libraries would merge the updates in base file if no conflict arises. However, for the case when a merge conflict occurs and has to be solved manually, a JS code editor library(CodeMirror) would be integrated with Plugin UI which would allow users to solve a merge conflict by displaying all the 3 files(Base, Theirs and Mine) in a 3 pane view. More details: https://groups.drupal.org/node/508466#project35



Rakesh Verma


  • dixon_
  • timmillwood
  • jeqq