Carlo van Wyk thecarlo

In the below keyboard shortcuts, I use the capital letters for reading clarity but this does not imply shift, if shift is needed, I will say shift. So ⌘ + D does not mean hold shift. ⌘ + Shift + D does of course.

Tabs and Windows

Function	Shortcut
New Tab	`⌘` + `T`
Close Tab or Window	`⌘` + `W` (same as many mac apps)
Go to Tab	`⌘` + `Number Key` (ie: `⌘2` is 2nd tab)
Go to Split Pane by Direction	`⌘` + `Option` + `Arrow Key`

Table Of Content

Skip to the relevant sections if needed.

2-min tutorial to do it the quick-and-dirty-way
Concepts for resolving Git conflicts
Setting up different editors / tool for using git mergetool
- Finding out what mergetool editors are supported
mergetool simple code example for vimdiff
- Resolving conflict from a Git pull
Other great references and tutorials

Dockerized JMeter - A Distributed Load Testing Workflow

Supported Cloud Providers:

Amazon (https://aws.amazon.com/free/)
DigitalOcean (https://www.digitalocean.com/join/)

Images used:

JMeter Server (https://hub.docker.com/r/hhcordero/docker-jmeter-server) aka "Slave"
JMeter Client Non-gui (https://hub.docker.com/r/hhcordero/docker-jmeter-client) aka "Master"

Add Git Branch Name to Terminal Prompt (Linux/Mac)

Open ~/.bash_profile in your favorite editor and add the following content to the bottom.

# Git branch in prompt.

parse_git_branch() {

Git

Learning Resources

Git from the Bottom Up
Using Git (GitLab Docs)
Using Git Effectively
A beginner's guide to Git version control (HN)

	#!/bin/bash
	#
	# steps taken verbatim from:
	# http://docs.aws.amazon.com/AmazonECS/latest/developerguide/docker-basics.html#install_docker
	#
	sudo yum update -y
	sudo yum install -y docker
	sudo service docker start
	sudo usermod -a -G docker ec2-user
	# log out and log in to pickup the added group

	1. my+ 1001. se+ 2001. thedaily+ 3001. empire+ 4001. herb+
	2. +online 1002. test+ 2002. giant+ 3002. +cook 4002. +teen
	3. the+ 1003. fish+ 2003. survey+ 3003. +deluxe 4003. affordable+
	4. +web 1004. hk+ 2004. +conference 3004. +crunch 4004. proto+
	5. +media 1005. florida+ 2005. twit+ 3005. michigan+ 4005. +ity
	6. web+ 1006. fine+ 2006. pick+ 3006. cars+ 4006. myhome+
	7. +world 1007. loan+ 2007. +dvd 3007. +forest 4007. plastic+
	8. +net 1008. page+ 2008. cinema+ 3008. yacht+ 4008. +kc
	9. go+ 1009. fox+ 2009. desi+ 3009. +wallet 4009. +foot
	10. +group 1010. +gift 2010. act+ 3010. +contest 4010. +sup

	var amqp = require('amqplib/callback_api');

	// if the connection is closed or fails to be established at all, we will reconnect
	var amqpConn = null;
	function start() {
	amqp.connect(process.env.CLOUDAMQP_URL + "?heartbeat=60", function(err, conn) {
	if (err) {
	console.error("[AMQP]", err.message);
	return setTimeout(start, 1000);
	}

	###############################################################################
	# Helpful Docker commands and code snippets
	###############################################################################

	### CONTAINERS ###
	docker stop $(docker ps -a -q) #stop ALL containers
	docker rm -f $(docker ps -a -q) # remove ALL containers
	docker rm -f $(sudo docker ps --before="container_id_here" -q) # can also filter

	# exec into container