Benjamin Ashbaugh bashbaugh

🐟

writing cod

building software. I love cows

bashbaugh / game-basic-layout.html

Last active February 24, 2019 04:58

	<!DOCTYPE html>

	<html>
	<head>
	<title>JavaScript Game</title>
	</head>
	<body onload="init()">
	<h1>JavaScript Game</h1>
	<p>Here is a simple JavaScript game:</p>
	<canvas id="c" width="400" height="400"></canvas>

bashbaugh / merge-conflict-diff-example

Last active January 26, 2019 18:45

	~/Documents/learning-git $ git merge b
	Auto-merging a.txt
	CONFLICT (content): Merge conflict in a.txt
	Automatic merge failed; fix conflicts and then commit the result.

	~/Documents/learning-git $ git diff a b
	... <-- You can ignore the lines right here for now, these are the important lines:
	-Adam <-- this tells us that Adam was removed in branch b
	+Bob <-- and this tells us that Bob was added.

bashbaugh / .gitignore

Last active December 29, 2018 17:17

	# An example .gitignore file
	# You can use * to indicate any string of characters
	# Git will ignore any files or directories that match the list below, when you run the git add . command.

	*.log
	*.pyc
	*.swp
	.swp
	/credentials
	/venv

bashbaugh / getBlockedWindowsCommandLine.bat

Last active February 3, 2019 22:07