ackuser ackuser

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:

Problem

If you're getting this kind of error when running Node.js programs with binary dependencies that don't support M1 yet, e.g.:

$ yarn test
dyld[51175]: missing symbol called
dyld[51176]: missing symbol called

Node.js on Apple Silicon

Node Version Manager (https://github.com/nvm-sh/nvm) works perfectly across native node installations as well as emulated Rosetta installations. The trick I am using here is to install one LTS version of node under Rosetta and another stable version as native binary.

TODO

find a way how to run the same node version on both platforms

In response to a question on Twitter by @everybody_kurts:

“Hi @mbostock, I was looking at your stacked area chart at https://observablehq.com/@d3/stacked-area-chart. At the end of the file, you import swatches from "@d3/color-legend". I tried finding this on npmjs but to no avail. Is this exclusive to @observablehq only?”

This shows how to use the swatches function from the @d3/color-legend notebook in a plain HTML page. The example data for the swatches (the color scale and margin) is copied from the @d3/stacked-area-chart notebook.

	export interface IEdge<T> {
	cursor: string;
	node: T;
	}

	interface IPageInfo {
	endCursor: string;
	hasNextPage: boolean;
	}

	/**
	* Table component that accepts column and row definitions in its content to be registered to the table.
	*/
	@Component({
	selector: 'mat-dynamic-table',
	templateUrl: './mat-dynamic-table.component.html',
	styleUrls: ['./mat-dynamic-table.component.scss'],
	changeDetection: ChangeDetectionStrategy.OnPush
	})
	export class MatDynamicTableComponent<T> implements OnInit, OnChanges, AfterContentInit {

	private tooltip: any; private total: number;

	constructor(private service: DataService) {
	// ...
	this.total = this.dataSource.reduce((sum, it) => sum += it.abs, 0);
	}

	ngOnInit() {
	// ...
	this.tooltip = d3.select('#pie') // or d3.select('#bar')

	import { Injectable } from '@angular/core';

	@Injectable()
	export class CookieService {

	constructor() {
	}

	set(key: string, value: string): void;
	set(key: string, value: string, expires: Date): void;

	import { Module } from '@nestjs/common';
	import { TypeOrmModule } from '@nestjs/typeorm';
	import { DatabaseModule } from 'modules/database/database.module';
	import { User } from 'modules/shared/entities/user.entity';
	import { UserService } from './services/user.service';

	@Module({
	imports: [DatabaseModule, TypeOrmModule.forFeature([User], Config.get.databases.main.name)],
	exports: [DatabaseModule, UserService],
	providers: [UserService]