🐢

Adam Tyson adamltyson

🐢

Neuroscientist and software developer

adamltyson / git-overwrite-branch.sh

Created September 23, 2019 17:43 — forked from ummahusla/git-overwrite-branch.sh

Git overwrite branch with another branch

	# overwrite master with contents of seotweaks branch (seotweaks > master)
	git checkout seotweaks # source name
	git merge -s ours master # target name
	git checkout master # target name
	git merge seotweaks # source name

adamltyson / logging.yaml

Created January 17, 2019 11:16 — forked from JesseBuesking/logging.yaml

Testing MultiProcessingLog on both Windows 7 Enterprise and Ubuntu Developers Version 10.04_20121120.

	---
	version: 1
	disable_existing_loggers: False
	formatters:
	simple:
	format: "%(name)-20s%(levelname)-8s%(message)s"
	handlers:
	console:
	class: logging.StreamHandler
	level: DEBUG