lowest common ancestor

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. 

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.