santisbon

Basic merge conflict

Go to your local project and fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits will be stored in a local branch, remote_name/branch_name

$ git fetch <remote_name>

Check out the branch you want to merge into e.g. master

$ git checkout <base_branch>

santisbon

Using Linux utilities on Windows

If you use a Windows computer at work you may feel that you're missing out on some really useful functionality that you're used to having on a UNIX system. Or perhaps you've always used Windows and have struggled with messy workarounds for something that would be easier with Linux commands.

If you're on an older version of Windows that doesn't have the Windows Subsystem for Linux (WSL) or you don't want to install a Linux distribution on your machine, you can still use Linux utilities to quickly get things done. At the end we'll see some notes about doing the same thing on WSL.

This brief guide will help you with an example of a common task: finding out which files have been modified on your computer (or a remote server) within a specified time frame.

First you'll need to install Cygwin. This program will let you use tools similar to a Linux distribution on Windows. At some point during

santisbon

Markdown cheat sheet

Create a Table of Contents

Download the tool to generate a table of contents.

Add an image to Github gist

git clone https://gist.github.com/<hash>.git # with https
git clone git@gist.github.com:.git # or with ssh

santisbon

cat <<EOF | kubectl create -f -
apiVersion: apps/v1
kind: Deployment
metadata: 
  name: nginx-deployment  
  labels: 
    app: nginx 
spec: 
  replicas: 2  
  selector: 

santisbon

# Use your instance domain
DOMAIN=hachyderm.io
EXCLUDE="blob|yeen|another|yetanother"

# Create the script file
cat << EOF > ~/emojos.sh
curl 'https://emojos.in/${DOMAIN}' -o emojos.htm
# Case-insensitive, print only the match rather than the entire line. Sort. Deduplicate. Redirect to file.
grep -io ':[a-zA-Z0-9]*_*[a-zA-Z0-9]*:' emojos.htm | sort | uniq -d > emojos.txt
# Filter out patterns (case-insensitive delete)

santisbon

#!/usr/bin/env bash

NODESAPI=/api/v1/nodes

function getNodes() {
  kubectl get --raw $NODESAPI | jq -r '.items[].metadata.name'
}

function getPVCs() {
  jq -s '[flatten | .[].pods[].volume[]? | select(has("pvcRef")) | '\