Multiversion - Resolving Merge Conflicts in Drupal 8 - First half completed

Submitted by rakesh on Wed, 06/22/2016 - 13:35

Google Summer of Code is halfway through and it’s now time for mid term evaluations. What that means is, we will be judged on the basis of our efforts and targets achieved and our mentors would decide if we pass of fail. If someone fails the mid term evaluation, he is removed from the program immediately.

Let us sum up all work we’ve done in the GSoC-coding phase 1.

Project: Solving content conflicts with merge algorithms in Drupal 8.

GSoC-16 "Multiversion"-Coding period - Week 3

Submitted by rakesh on Tue, 06/14/2016 - 18:31

Background Information: We needed a PHP Library for our project which could return the Lowest Common Ancestor (LCA) from a Directed Acyclic Graph (DAG). This LCA would act as a base node for our Remote and Local nodes and the nodes will be compared with this LCA to detect a conflict otherwise merge. For more details about the project, please refer to this page. Let's take a look at the detailed description of the problem as well as the approach we are working on.

GSoC-2k16 Coding period - Week 1

Submitted by rakesh on Wed, 06/08/2016 - 22:47

After the successful completion of Community bonding period of Google Summer of Code 2016, Coding Period has been started. Although I already knew that it would be awesome but reality is much more amazing than I ever imagined.

Project : Solving content conflicts with merge algorithms in Drupal8.