PJ Kelly pjkelly

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

	<!-- Arguments without quotes -->
	<!-- ISSUE: Only content between first two quotes rendered -->
	<figure class="figure class1"><div class="figure__main">
	<p><img src="/assets/images/2008/12/chicago.jpg" alt="" /></p>
	</div><figcaption class="figure__caption"><p>Cloud Gate</p>
	</figcaption></figure>

	<!-- Arguments with single quotes, regardless of content -->
	<!-- ISSUE: Nothing generated if argument contains quotes -->
	<figure class="figure class1 class2"><div class="figure__main">

	import React from 'react';
	import $script from 'scriptjs';

	require('postscribe/htmlParser/htmlParser.js'); // This is required for postScribe, postScribe is a bit annoying.
	const postscribe = require('exports?postscribe!postscribe'); // Needs webpack exports-loader! Otherwise, just require it and use window.postscribe.

	// This GlobalAdCodePromise is a simple promise that uses script.js to load a javascript file and then resolve.
	const GlobalAdCodePromise = new Promise((resolve) => {
	setTimeout(() => {
	$script('http://annoying.adprovider.com/ad.js', () => {