merge conflicts

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.

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.

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.