library site-merge

netw3rker/site-merge

Merges multi-site configurations from source configs. This is different from config-merge which merges individual sites with their upstream counterparts.

Requirements

• Works with Drush master (Drush version 8.x) and Drupal 8.0.x and later.
• Requires a three-way merge tool, such as kdiff3

Installation

1. cd "$HOME/.drush"
2. composer global require "netw3rker/site-merge"
3. drush cc drush

Usage

This tool is designed to work with Drupal 8 installations that work in multisite mode, where each site descends from a common (and maintained) ancestor site. The configuration for each site is expected to be exported and tracked in individual folders within the same repository. For example:, _(*1)

The default site "example.com" provides content about cities. a specific site "nyc.example.com" provides content only about NYC. a specific site "sfo.example.com" provides content only about SFO., _(*2)

These three sites exist as separate configuration sets with separate databases of content. The only important aspect of this is that the NYC and SFO sites were initially created by importing the default example.com configuration set first., _(*3)

The goal of the maintainer is to be able to make configuration changes to example.com, and then merge those changes into SFO and NYC sites. The merge should preserve any non-conflicting changes between the sites., _(*4)

The desired functionality can be easily achieved with this tool by running the following command:, _(*5)

drush site-merge default sfo.example.com --ancestor-commit=[HASH], _(*6)

Resources