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

Download & install

$ wget https://github.com/FiloSottile/age/releases/download/v1.0.0-beta2/age-v1.0.0-beta2-linux-amd64.tar.gz
$ tar -xzvf age-v1.0.0-beta2-linux-amd64.tar.gz
$ sudo cp age/* /usr/local/bin/

Generate a keypair

$ age-keygen -o ~/.age/(date +%s)-(hostname).key

ANSI Escape Sequences

Standard escape codes are prefixed with Escape:

Ctrl-Key: ^[
Octal: \033
Unicode: \u001b
Hexadecimal: \x1B
Decimal: 27

libdispatch efficiency tips

The libdispatch is one of the most misused API due to the way it was presented to us when it was introduced and for many years after that, and due to the confusing documentation and API. This page is a compilation of important things to know if you're going to use this library. Many references are available at the end of this document pointing to comments from Apple's very own libdispatch maintainer (Pierre Habouzit).

My take-aways are:

You should create very few, long-lived, well-defined queues. These queues should be seen as execution contexts in your program (gui, background work, ...) that benefit from executing in parallel. An important thing to note is that if these queues are all active at once, you will get as many threads running. In most apps, you probably do not need to create more than 3 or 4 queues.
Go serial first, and as you find performance bottle necks, measure why, and if concurrency helps, apply with care, always validating under system pressure. Reuse

	//
	// TaggerView.swift
	//
	// Created by Alex Hay on 21/11/2020.
	//
	// Simple interface for adding tags to an array in SwiftUI
	// Example video: https://imgur.com/gallery/CcA1IXp
	// alignmentGuide code from Asperi @ https://stackoverflow.com/a/58876712/11685049

	import SwiftUI

	// -- Usage

	struct Content: View {
	@State var open = false
	@State var popoverSize = CGSize(width: 300, height: 300)

	var body: some View {
	WithPopover(
	showPopover: $open,
	popoverSize: popoverSize,

	Mute these words in your settings here: https://twitter.com/settings/muted_keywords

	ActivityTweet
	generic_activity_highlights
	generic_activity_momentsbreaking
	RankedOrganicTweet
	suggest_activity
	suggest_activity_feed
	suggest_activity_highlights
	suggest_activity_tweet

	function switchgo() {
	version=$1
	if [ -z $version ]; then
	echo "Usage: switchgo [version]"
	return
	fi

	if ! command -v "go$version" > /dev/null 2>&1; then
	echo "version does not exist, download with: "
	echo " go get golang.org/dl/go${version}"

	struct ContentView: View {
	@State var moved: CGFloat = 0
	@State var startTime: Date?
	var body: some View {

	//0 means that it acts like a press
	//coordinateSpace local means local to the view its added to
	let tap = DragGesture(minimumDistance: 0, coordinateSpace: .local)
	.onChanged { value in
	//store distance the touch has moved as a sum of all movements

	//
	// UIScrollViewWrapper.swift
	// lingq-5
	//
	// Created by Timothy Costa on 2019/07/05.
	// Copyright © 2019 timothycosta.com. All rights reserved.
	//

	import SwiftUI