David Smith codeactual

Have you ever tried to merge two branches only to end up in conflict hell? You fix a bunch of conflicts only to run git merge --continue and be presented with the same conflicts. Repeat this process and after a few iterations you give up because it just isn't worth the pain and effort.

Would you be surprised to know that there is a git feature specifically for this problem? It's called rerere and I'm going to enrich your life with it now. (I'm going to talk specifically about merging but I think it also helps rebasing)

rerere stands for Reuse Recorded Resolution. The TL;DR version is you ask git to remember how you've resolved hunks in the past, and if the same one comes up for a file in future just redo what you did last time.

To enable this feature just run this lovely command git config --global rerere.enabled true. You can also turn it on by creating this directory in your projects .git/rr-cache, although the global setting is much clearer.

I'll try to take you through an example of how th

Terminals should generate the 256-color palette from the user's base16 theme.

If you've spent much time in the terminal, you've probably set a custom base16 theme. They work well. You define a handful of colors in one place and all your programs use them.

The drawback is that 16 colors is limiting. Complex and color-heavy programs struggle with such a small palette.

What you NEED to Know Before Touching a Video File

Hanging out in subtitling and video re-editing communities, I see my fair share of novice video editors and video encoders, and see plenty of them make the classic beginner mistakes when it comes to working with videos. A man can only read "Use Handbrake to convert your mkv to an mp4 :)" so many times before losing it, so I am writing this article to channel the resulting psychic damage into something productive.

If you are new to working with videos (or, let's face it, even if you aren't), please read through this guide to avoid making mistakes that can cost you lots of computing power, storage space, or video quality.

SSH agent forwarding and screen

When connecting to a remote server via SSH it is often convenient to use SSH agent forwarding so that you don't need a separate keypair on that server for connecting to further servers.

This is enabled by adding the

ForwardAgent yes

option to any of your Host entries in ~/.ssh/config (or alternatively with the -A option). Don't set this option in a wildcard Host * section since any user on the remote server that can bypass file permissions can now als use keys loaded in your SSH agent. So only use this with hosts you trust.

	//Now with less jquery
	//1) go to your my-list page, and scroll to the bottom to make sure it's all loaded:
	//http://www.netflix.com/browse/my-list

	//2) Next, paste this in your developer tools console and hit enter:
	[...document.querySelectorAll('.slider [aria-label]')].map(ele => ele.getAttribute('aria-label'))
	//or use this to copy the list to your clipboard:
	copy([...document.querySelectorAll('.slider [aria-label]')].map(ele => ele.getAttribute('aria-label')))

	#!/usr/bin/env python3
	"""
	Detects whether the terminal is using a light or dark theme and automatically
	adjusts 256-color palette indices so that colors render consistently regardless
	of the active theme. This is especially useful when a terminal (e.g. Ghostty)
	generates its 256-color palette to match the current theme — or when it doesn't,
	and we need to compensate by flipping the indices ourselves.
	"""

	import os

	struct OverflowLayout: Layout {
	var spacing = CGFloat(10)

	func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) -> CGSize {
	let containerWidth = proposal.replacingUnspecifiedDimensions().width
	let sizes = subviews.map { $0.sizeThatFits(.unspecified) }
	return layout(sizes: sizes, containerWidth: containerWidth).size
	}

	func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) {

	ACTION=install
	ADDITIONAL_SDKS=
	AD_HOC_CODE_SIGNING_ALLOWED=YES
	ALL_OTHER_LDFLAGS=' '
	ALL_OTHER_LIBTOOLFLAGS=' '
	ALTERNATE_GROUP=staff
	ALTERNATE_LINKER=
	ALTERNATE_MODE=u+w,go-w,a+rX
	ALTERNATE_OWNER=username
	ALTERNATE_PERMISSIONS_FILES=

	//
	// SFSymbolImage.swift
	// SFSymbolVariableValueAnimationWrong
	//
	// Created by Matthew Young on 12/22/22.
	//

	import SwiftUI

	struct AnimatableVariableValueModifier: Animatable, ViewModifier {

	SELECT * FROM table
	WHERE _ROWID_ >= (abs(random()) % (SELECT max(_ROWID_) FROM table))
	LIMIT 1