Simon Thompson simonthompson99

git stash list see what is in the stash list
git stash show -p see full diff of the stash (add specific stash, otherwise will be most recent)

git stash stash all changes to tracked files and revert to HEAD, add -m <message> to give an accompany description, and can specify some filepaths to limit the stash to
git stash -p go through hunk by hunk and decided what to stash

FUNCTION	DESCRIPTION
index()	Method returns index (row labels) of the DataFrame
insert()	Method inserts a column into a DataFrame
add()	Method returns addition of dataframe and other, element-wise (binary operator add)
sub()	Method returns subtraction of dataframe and other, element-wise (binary operator sub)
mul()	Method returns multiplication of dataframe and other, element-wise (binary operator mul)
div()	Method returns floating division of dataframe and other, element-wise (binary operator truediv)
unique()	Method extracts the unique values in the dataframe
nunique()	Method returns count of the unique values in the dataframe

Merging two very different branches

git checkout master to be in master

git merge <branch> to merge in the other branch, will tell you that can't auto-merge

git mergetool brings up a vim window with:

+--------------------------------+

	/* use user:password for superuser on https://cnfl.extge.co.uk/display/CDT/_Logins */
	psql metrics -h localhost -p 5441 -U postgres
	create database <db_name>;
	grant all privileges on database <db_name> to cdt_user;

	Function GetFillColor(Rng As Range) As Long
	GetFillColor = Rng.Interior.ColorIndex
	End Function

	# to use this:
	# 1. open the visual basic editor (alt + F11 or fn + alt + f11)
	# 2. paste the above code
	# 3. save then quit and return to the workbook

	# take a load of boolean flag columns (names beginning with f_) and produce a column that lists which flags the row is true for
	concat_flags <- function(x){
	separator = ';'
	a <- paste0(names(x)[as.logical(x)], sep = separator)
	ifelse(a == separator, NA, a)
	}

	data$concat_flags <- apply(data[,colnames(data)[startsWith(colnames(data), "f_")]], 1, concat_flags)

	-- generates 5000000 rows of random data
	select i
	,now() - (random() * (interval '100 years'))
	,(array['1', '2'])[floor(random() * 2 + 1)]
	from pg_catalog.generate_series(100000001, 105000000, 1) s(i)
	;

	select pg_terminate_backend(pg_stat_activity.pid)
	from pg_stat_activity
	where pg_stat_activity.datname = '<db_name>' -- ← change this to your db
	and pid <> pg_backend_pid() and usename = '<user>'
	;

	# get listing of files in file tree with glob-like searching
	files = [f for f in glob.glob(SOURCE_DIR + '/*/af.xlsx', recursive=True)]