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:
This is an incremental tutorial on how to share JetStream assets between accounts.
The options are not going to be fully explained unless they are vital. The tools used
are nats cli and nsc, and both have excellent --help
.
Note that this tutorial is expected to be followed in sequence.
- Understand imports and exports and JWT
- Last tested version: 5.7.20
- Make sure LXC has more than 12GB, otherwise Unifi fails to start!
# for unifi
echo 'deb http://www.ubnt.com/downloads/unifi/debian stable ubiquiti' | sudo tee /etc/apt/sources.list.d/100-ubnt-unifi.list
package main | |
import ( | |
"fmt" | |
"io" | |
"net/http" | |
"net/http/httputil" | |
"os" | |
) |
#!/bin/bash | |
read -r -d '' AWK <<EOF | |
{ | |
date=\$1; | |
refname=\$2; | |
subject=substr(\$3,1,72); | |
sha=\$4; | |
len=split(refname, ref, "/"); |