Vesa Vänskä vesan

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:

Rails views with stimulusjs opinion

References

Known component/view patterns:

This middleware does a few interesting things:

Ensures a url shape in the zustand store, where we'll store URL information.
Assumes we will be storing our url state slice in the ?state search parameter after it has been stringified and base 64 encoded.
On creation, decodes stores state from the ?state search parameter into the url slice of our store.
After each state update, updates the ?state search parameter with the new url state slice.
Sets up an event listener that listens for popstate and re-decodes the state from the URL into our store.

Next.js client-only SPA example

Made this example to show how to use Next.js router for a 100% SPA (no JS server) app.

You use Next.js router like normally, but don't define getStaticProps and such. Instead you do client-only fetching with swr, react-query, or similar methods.

You can generate HTML fallback for the page if there's something meaningful to show before you "know" the params. (Remember, HTML is static, so it can't respond to dynamic query. But it can be different per route.)

Don't like Next? Here's how to do the same in Gatsby.

	# THIS LINUX SETUP SCRIPT HAS MORPHED INTO A WHOLE PROJECT: HTTPS://OMAKUB.ORG
	# PLEASE CHECKOUT THAT PROJECT INSTEAD OF THIS OUTDATED SETUP SCRIPT.
	#
	#

	# Libraries and infrastructure
	sudo apt update -y
	sudo apt install -y \
	docker.io docker-buildx \
	build-essential pkg-config autoconf bison rustc cargo clang \

	#!/usr/bin/env bash
	# ~/.ssh/gcp-start-iap-tunnel-ssh-proxy-magic.sh
	# a script to be used as SSH ProxyCommand to allow fully functional SSH access to any Google Cloud Compute Engine VMs allowing IAP access
	#
	# Author: Jaeho Shin <netj@sparcs.org>
	# Created: 2022-10-31
	# See also:
	# - https://gist.github.com/netj/df4f9de1fefd254ab11979be7035b5d0/#readme
	# - https://cloud.google.com/iap/docs/using-tcp-forwarding
	#

	// db.ts
	import * as schema from "./schema"
	export const db = drizzle(connection, { schema })


	//reset.ts
	async function reset() {
	const tableSchema = db._.schema
	if (!tableSchema) {
	throw new Error("No table schema found")

	# PATH: config/initializers/sidekiq_alive.rb
	# AUTHOR: Andrei Makarov (github.com/amkisko)

	# NOTE: now available as gem sidekiq_status_monitor (https://rubygems.org/gems/sidekiq_status_monitor)

	class SidekiqAliveServer
	attr_accessor :workers_size_threshold,
	:process_set_size_threshold,
	:queues_size_threshold,
	:queue_latency_threshold,

	<%=
	button_to(omniauth_authorize_path(resource_name, provider),
	method: :post,
	style: "margin:1rem;align-items:center;color:#fff;background-color:#4A154B;border:0;border-radius:48px;display:inline-flex;font-family:Lato, sans-serif;font-size:16px;font-weight:600;height:48px;justify-content:center;text-decoration:none;width:256px",
	"data-turbo": false) do
	%>
	<svg
	xmlns="http://www.w3.org/2000/svg"
	style="height:20px;width:20px;margin-right:12px"
	viewBox="0 0 122.8 122.8"

	class Object::Proxy < SimpleDelegator
	def initialize(object, **values)
	super(object)
	@values = values
	end

	def method_missing(name, ...)
	@values.fetch(name) { super }
	end
	end