Crismar Mejia crmejia

I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing. I've typed up this response so many times that I've decided to just put it in a gist so I can reference it whenever it comes up again.

I use merge, squash, rebase all situationally. I believe they all have their merits but their usage depends on the context. I think anyone who says any particular strategy is the right answer 100% of the time is wrong, but I think there is considerable acceptable leeway in when you use each. What follows is my personal and professional opinion:

INTRO

Concurrency is a domain I have wanted to explore for a long time because the locks and the race conditions have always intimidated me. I recall somebody suggesting concurrency patterns in golang because they said "you share the data and not the variables".

Amused by that, I searched for "concurrency in golang" and bumped into this awesome slide by Rob Pike: https://talks.golang.org/2012/waza.slide#1 which does a great job of explaining channels, concurrency patterns and a mini-architecture of load-balancer (also explains the above one-liner).

Let's dig in:

Goroutines

Requirements

Minikube requires that VT-x/AMD-v virtualization is enabled in BIOS. To check that this is enabled on OSX / macOS run:

sysctl -a | grep machdep.cpu.features | grep VMX

If there's output, you're good!

Prerequisites

tmux shortcuts & cheatsheet

start new:

tmux

start new with session name:

tmux new -s myname

	#cloud-config

	# Option 1 - Full installation using cURL
	package_update: true
	package_upgrade: true

	groups:
	- docker

	system_info:

	# first:
	lsbom -f -l -s -pf /var/db/receipts/org.nodejs.pkg.bom \| while read f; do sudo rm /usr/local/${f}; done
	sudo rm -rf /usr/local/lib/node /usr/local/lib/node_modules /var/db/receipts/org.nodejs.*

	# To recap, the best way (I've found) to completely uninstall node + npm is to do the following:

	# go to /usr/local/lib and delete any node and node_modules
	cd /usr/local/lib
	sudo rm -rf node*


	- si el post original dice "mejor" skip it.
	- si dice offtopic you should read it.
	- si dije java y .net en la misma oracion skip it.
	- Si melvyn arranco el post skip it.
	- If it has more than 50 replies skip it.
	- if marmolejos answered first skip it.
	- if Orly quotes the rules skip it.
	- if it contains php next, probably not worth it.
	- si dice morrison, dodo o software libre skip it.

	#BECOME SUPER USER#

	sudo -i

	#add sublime to repository#

	add-apt-repository ppa:webupd8team/sublime-text-2

	#update#