Lauchlin lokulin

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

Each of these commands will run an ad hoc http static server in your current (or specified) directory, available at http://localhost:8000. Use this power wisely.

Discussion on reddit.

Python 2.x

$ python -m SimpleHTTPServer 8000

	import logging
	import boto3
	from argparse import ArgumentParser, HelpFormatter
	from botocore.exceptions import ClientError, ProfileNotFound

	# logger config
	logger = logging.getLogger()
	logging.basicConfig(level=logging.INFO,
	format='%(message)s')

	#!/usr/bin/env python3
	# vim: fileencoding=utf-8
	"""
	Upload a TLS key and cert to a FRITZ!Box, in pretty Python
	Copyright (C) 2018--2021 Olivier Mehani <[email protected]>

	This program is free software; you can redistribute it and/or modify
	it under the terms of the GNU General Public License as published by
	the Free Software Foundation; either version 2 of the License, or
	(at your option) any later version.

	#!/bin/bash
	## this little Gist is for Copy the Letsencrypt Cert from an Linux machine (e.g. Raspberry PI or Synology NAS)
	## to the router (Fritzbox).
	## It is usefull to be able to speak to the Router over DDNS without any Cert issue in the Browser.
	## thanks to https://gist.github.com/mahowi for the perfect Idea
	## put it in /etc/letsencrypt/renewal-hooks/post so it gets run after every renewal.
	## since Fritz OS 7.25 it is needed to select a Username, from a security point of view
	## it is always a good idea to have a non default user name. And as normaly a Fritz Box
	## is connected to the Internet, the prefered method should be WITH Username.

	Vagrant.configure(2) do \|config\|
	config.vm.box = "phusion/ubuntu-14.04-amd64"

	config.vm.network "forwarded_port", guest: 3306, host: 3306

	# If errors occur, try running "vagrant provision" manually
	# after "vagrant up"
	config.vm.provision :docker
	# To use docker_compose as a provisioning tool, install
	# vagrant-docker-compose plugin first. It should also solve the

	* {
	font-size: 12pt;
	font-family: monospace;
	font-weight: normal;
	font-style: normal;
	text-decoration: none;
	color: black;
	cursor: default;
	}