Philip vHeemstra

With the introduction of GitHub's Squash and Merge feature, this has become less prevelant, however it's still useful in scenarios where GitHub's interface is unavailable.

Let's talk through two ways to do a squash and merge on the command line.

Take 1: Interactive Rebase

When to use it

When you have not merged main into your feature branch
There are no merge conflicts

ANSI Escape Sequences

Standard escape codes are prefixed with Escape:

Ctrl-Key: ^[
Octal: \033
Unicode: \u001b
Hexadecimal: \x1B
Decimal: 27

	/*
	* Copyright (c) 2010 Tobias Schneider
	* This script is freely distributable under the terms of the MIT license.
	*/

	(function(){
	var UPC_SET = {
	"3211": '0',
	"2221": '1',
	"2122": '2',

	// takes a {} object and returns a FormData object
	var objectToFormData = function(obj, form, namespace) {

	var fd = form \|\| new FormData();
	var formKey;

	for(var property in obj) {
	if(obj.hasOwnProperty(property)) {

	if(namespace) {

	<!doctype html>
	<html>
	<title>Flatten.js, General SVG Flattener</title>

	<head>
	<script>
	/*
	Random path and shape generator, flattener test base: http://jsfiddle.net/xqq5w/embedded/result/
	Basic usage example: http://jsfiddle.net/Nv78L/3/embedded/result/

	#! /bin/bash

	# ECHO COMMAND
	# echo Hello World!

	# VARIABLES
	# Uppercase by convention
	# Letters, numbers, underscores
	NAME="Bob"
	# echo "My name is $NAME"

	<?php

	require('fpdf.php');

	class TextNormalizerFPDF extends FPDF
	{
	function __construct()
	{
	parent::__construct();
	}