Amit Thawait Amit-Thawait

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:

“Why Functional Programming Matters” by John Hughes.

https://www.cs.kent.ac.uk/people/staff/dat/miranda/whyfp90.pdf.

https://blog.acolyer.org/2016/09/14/why-functional-programming-matters/

“The Design of a Pretty-printing Library” by John Hughes.

Prologue

I wrote this answer on stackexchange, here: https://stackoverflow.com/posts/12597919/

It was wrongly deleted for containing "proprietary information" years later. I think that's bullshit so I am posting it here. Come at me.

The Question

Amazon is a SOA system with 100s of services (or so says Amazon Chief Technology Officer Werner Vogels). How do they handle build and release?

	Add the `replication` section to the mongod.conf file:

	```
	$cat /usr/local/etc/mongod.conf
	systemLog:
	destination: file
	path: /usr/local/var/log/mongodb/mongo.log
	logAppend: true
	storage:
	engine: mmapv1

	source 'https://rubygems.org'

	gem 'clearwater', '~> 1.0.0.rc1'
	gem 'opal-rails'
	gem 'grand_central'

	# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
	gem 'rails', '4.2.6'
	# Use sqlite3 as the database for Active Record
	gem 'sqlite3'

	#$null_stream = $stdout
	$null_stream = File.open(File::NULL, 'w')

	if defined? Minitest
	RSpec = Minitest::Spec
	module Minitest
	class << self
	alias :old_process_args :process_args
	def process_args *args
	options = old_process_args(*args)

	class Dog
	attr_writer :name

	def initialize(name)
	@name = name
	end

	def bark
	puts "patrick"
	end

	module Enumerable
	def first_to_finish
	threads = collect { \|args\| Thread.new { yield(args) } }
	loop until done = threads.detect { \|t\| !t.alive? }
	threads.each(&:kill)
	done.value
	end
	end

	puts [5, 3, 1, 2, 4].first_to_finish { \|x\| sleep x }