August Miller AugustMiller

Project Config

Project Config is a powerful tool for managing the schema of a Craft application.

However, as with any text stored in version control, it can and will cause merge conflicts when multiple team members make changes to the same system settings.

These problems are exacerbated by Craft's strategy of rebuilding the entire config/project directory whenever a change is made. Of course, this helps keep the files and properties organized and up-to-date—but it can also squash changes under certain circumstances.

The Problem Scenario

Keybase proof

I hereby claim:

I am augustmiller on github.
I am awmiller (https://keybase.io/awmiller) on keybase.
I have a public key ASBgbxeFHc-8kvRHREGvnJy2bEqD5s8caibq0ohbwJnm4wo

To claim this, I am signing this object:

	let source = null;

	window.addEventListener('mousedown', function (e) {
	e.preventDefault();
	source = e;
	});

	window.addEventListener('mouseup', function (e) {
	const delta = Math.sqrt(Math.pow(source.pageX - e.pageX, 2) + Math.pow(source.pageY - e.pageY, 2));
	const $eyes = document.createElement('img');

	{
	"editor.fontSize": 14,
	"editor.cursorWidth": 2,
	"editor.lineHeight": 25,
	"editor.renderWhitespace": "all",
	"files.insertFinalNewline": true,
	"editor.wordWrap": "on",
	"workbench.colorTheme": "BirdsofParadise",
	"editor.rulers": [
	80

	{% set incrementable = incrementable ?? true %}
	{% set decrementable = decrementable ?? true %}

	<div class="line-item__controls">
	{% if incrementable or decrementable %}
	<div class="line-item__quantity">
	<form
	method="POST"
	data-ajax>
	{{ csrfInput() }}

	<?php

	namespace modules\mymodule;

	use Craft;
	use craft\elements\User;
	use craft\helpers\ArrayHelper;

	use yii\base\Event;

	<?php
	namespace dpdx\plugin\adjusters;

	use Craft;
	use craft\base\Component;
	use craft\helpers\ArrayHelper;

	use craft\commerce\Plugin as Commerce;
	use craft\commerce\base\AdjusterInterface;
	use craft\commerce\elements\Order;

	.
	├── backup.sh
	├── backups
	│ ├── latest -> /home/minecraft/bedrock/backups/worlds-2020-04-04T19:30:01+00:00
	│ ├── lock (When a backup is running)
	│ ├── worlds-2020-04-03T23:31:10+00:00
	│ ├── worlds-2020-04-03T23:31:10+00:00
	│ ├── worlds-2020-04-04T00:00:01+00:00
	│ ├── worlds-2020-04-04T18:30:01+00:00
	│ ├── worlds-2020-04-04T19:00:01+00:00

	<?php namespace modules\mymodule\controllers;

	use Craft;
	use craft\web\Controller;

	use yii\web\ForbiddenHttpException;

	/**
	* The Base Controller for all Module Controllers
	*

	<?php
	namespace modules;

	use Craft;

	/**
	* Custom module class.
	*
	* This class will be available throughout the system via:
	* `Craft::$app->getModule('my-module')`.