Recap: We need to detect and resolve merge conflicts in Drupal8 which might arise when two users try to push the same entities but modified at respective end to the server without pulling the latest changes. We are implementing a “conflict” module to help detecting conflicts otherwise merge. For a complete description of what the project is about, please review to the 3rd week’s blog where I have given a complete walk through of the project.
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.
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.
Hey all. Last week, we created PHP Library for finding the Lowest Common ancestor from a Directed Acyclic Graph and the code for that library can be find over github. Before moving forward, Let me explain about my project:
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.
Finally the hard work paid off.
It all started from a mail which had contents something like: