Drupal Planet

GSoC Final Submission

Submitted by rakesh on Tue, 08/23/2016 - 14:29

GSoC is almost over and I’m now submitting the project which I started with my awesome mentors Dick Olsson, Andrei Jechiu and Tim Millwood nearly 4 months ago. I knew it’d be a really great journey but I had no idea it’d be this awesome. Everything related to GSoC was perfect. The organisation, my mentors, the project itself was enough challenging as well as interesting at the same time.

Last week - GSoC16 - Detected and Solved Merge Conflicts in Drupal8.

Submitted by rakesh on Wed, 08/17/2016 - 23:34

Woah!! We're in last week of Google Summer of Code. Hard to believe that the journey we started from 22nd April is about to come to an end. Soon I’ll be publishing a post summarizing all my experience, development and other great achievements during this time. It was a really awesome journey but I’m really happy that the bond we share with the community and open source is not tied to GSoC only. The thought that I would be able to contribute after GSoC as well gives me  a really good motivation.

Solving Merge Conflicts in Drupal -GS0C16 - Week 11

Submitted by rakesh on Wed, 08/10/2016 - 20:45

Project Details: The task is to solve the conflicts which may occur when two users try to push the same content with modifications in same piece of content/entity on their respective end. So far, we've a way to detect conflicts but not any to solve them. 

Solving merge Conflicts in drupal8 - GSoC16 - Week10

Submitted by rakesh on Fri, 08/05/2016 - 22:03

Project Details: With the introduction of Multiversion module in Drupal 8, we 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.

Solving merge Conflicts in drupal8 - GSoC16 - Week9

Submitted by rakesh on Wed, 07/27/2016 - 22:02

It's been 3 months now and we're finally approaching the last steps of our project - "Solving Merge conflict in Drupal 8" with Multiversion module. So far, we have launched two Open source Libraries, Implemented Simple LCA resolver and a simple merge resolver in the Conflict  module to find lowest common ancestor and merge the updates respectively. Now all development phase is almost done and the integration part starts where we have to integrate the Libraries we created in the first phase of Google Summer of Code16.

Creating the Conflict Module - GSoC-16 week 6

Submitted by rakesh on Thu, 07/07/2016 - 14:17

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.

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.