Skip to content

Instantly share code, notes, and snippets.

View Trott's full-sized avatar

Rich Trott Trott

View GitHub Profile
'use strict'
const { parentPort, workerData } = require('worker_threads')
const individualTrack = require('music-routes-data/data/individual_track.json')
const tracks = []
const individuals = []
const { id, index } = workerData
@Trott
Trott / rebase.md
Created May 27, 2022 22:52
Rebasing away merge conflicts
$ git fetch upstream
$ git fetch origin
$ git checkout feature-branch
$ git rebase origin/feature-branch
$ git rebase upstream/main

Oh noes! A merge conflict appears here!