nicl

Git commands sufficient for 99.9% of the time:

git status
git add -A
git branch
git checkout [-b]
git rebase [-i] master // interactive rebase is amazing
git reset HEAD [file] // when I accidentally add something
git reset HEAD^1 // for when you accidentally commit on master

nicl

First, read https://raw.githubusercontent.com/nicl/nicl.github.com/master/_posts/2018-07-12-branching.md.

Now let's take an example from DCR:

https://github.com/guardian/dotcom-rendering/blob/master/src/web/components/MediaMeta.tsx

This file handles media meta for galleries, photos, and videos. It is an example of what the blog post is talking about: it handles different things but doesn't keep branches separate.

To illustrate, look at the following:

nicl

package main

import (
	"fmt"
	"time"
)

/* The requirements are:
1. process the list in batches
2. take into account unprocessed items in the dynamo response

nicl

package main

import (
	"context"
	"fmt"
	"math/rand"
	"time"
)

// Pretend we are finding tokens from the db and stream them over a channel.