Charlie Martin cmmartin

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:

Swift Don'ts

Don't add code cruft. Avoid parentheses around conditions in if-statements or with the return keyword. Don't add semicolons except where syntactically demanded in statements or to separate statements on the same line.
Don't use ALL_CAPS; use camelCase
Don't fight type inference. Use enumeration prefixes, self-references, and class names (with constructors) only when necessary or to clarify coding intent.
Don't use var when let is appropriate, especially for properties. The compiler better optimizes let statements for items whose values will not change during their lifetime. For example, Apple writes, "It is good practice to create immutable collections in all cases where the collection does not need to change. Doing so enables the Swift compiler to optimize the performance of the collections you create."
Don't use classes when structs will do. Use class

	# Assumes the database container is named 'db'

	DOCKER_DB_NAME="$(docker-compose ps -q db)"
	DB_HOSTNAME=db
	DB_USER=postgres
	LOCAL_DUMP_PATH="path/to/local.dump"

	docker-compose up -d db
	docker exec -i "${DOCKER_DB_NAME}" pg_restore -C --clean --no-acl --no-owner -U "${DB_USER}" -d "${DB_HOSTNAME}" < "${LOCAL_DUMP_PATH}"
	docker-compose stop db

	exports.knex = require('knex')({
	client: 'pg',
	connection: {
	host : '127.0.0.1',
	user : 'your_database_user',
	password : 'your_database_password',
	database : 'myapp_test'
	}
	});

	var OFF = 0, WARN = 1, ERROR = 2;

	module.exports = exports = {
	"env": {
	"es6": true
	},

	"ecmaFeatures": {
	// env=es6 doesn't include modules, which we are using
	"modules": true

	<?php
	// This is sample code to draw some of the charts I blogged about here:
	// https://medium.com/ios-os-x-development/keeping-your-wits-as-an-indie-app-developer-3b5b14428e1f
	//
	// A few disclaimers:
	// 1. This assumes you have at least 30 days of sales data in order to draw the Trailing 7 Days Chart
	// 2. This assumes you have over 52 consecutive weeks of data in order to draw the Trailing Year Chart
	// 3. I don't really know PHP. Everything this does, I had to look it up while writing it. If you actually know PHP, sorry. There are surely better ways.
	//
	// the results of this PHP script is intended to be drawn using the Flot library.

	/* @flow */

	var React = require("react")
	var Immutable = require("immutable")

	// In order to use any type as props, including Immutable objects, we
	// wrap our prop type as the sole "data" key passed as props.
	type Component<P> = ReactClass<{},{ data: P },{}>
	type Element = ReactElement<any, any, any>

	import {Component as _Component, Template as _Template} from 'angular2/src/core/annotations/annotations';

	function makeDecorator(annotationClass) {
	return (options) => {
	return (klass) => {
	klass.annotations = klass.annotations \|\| [];
	klass.annotations.push(new annotationClass(options));
	return klass;
	};
	};


	var pickFiles = require('broccoli-static-compiler');
	var fastBrowserify = require('broccoli-fast-browserify');
	var babelTranspiler = require('broccoli-babel-transpiler');
	var mergeTrees = require('broccoli-merge-trees');

	var libTree = pickFiles('lib', {

	files: ['*/.js'],

	int doubler(int x) {
	return 2 * x;
	}