Maria Campbell interglobalmedia

Re-installing Git on Mac OSX with Brew

This is helpful if you've previously installed git from source on OSX, and other compilers can't find the correct path. You need to remove the current version of git, then re-install with brew.

Uninstall git if installed manually

Check which git you're running:
```
which git
```

Whether you're trying to give back to the open source community or collaborating on your own projects, knowing how to properly fork and generate pull requests is essential. Unfortunately, it's quite easy to make mistakes or not know what you should do when you're initially learning the process. I know that I certainly had considerable initial trouble with it, and I found a lot of the information on GitHub and around the internet to be rather piecemeal and incomplete - part of the process described here, another there, common hangups in a different place, and so on.

In an attempt to coallate this information for myself and others, this short tutorial is what I've found to be fairly standard procedure for creating a fork, doing your work, issuing a pull request, and merging that pull request back into the original project.

Creating a Fork

Just head over to the GitHub page and click the "Fork" button. It's just that simple. Once you've done that, you can use your favorite git client to clone your repo or j

Git-workflow vs feature branching

When working with Git, there are two prevailing workflows are Git workflow and feature branches. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited, and the focus of this article.

If you are new to Git and Git-workflows, I suggest reading the atlassian.com Git Workflow article in addition to this as there is more detail there than presented here.

I admit, using Bash in the command line with the standard configuration leaves a bit to be desired when it comes to awareness of state. A tool that I suggest using follows these instructions on setting up GIT Bash autocompletion. This tool will assist you to better visualize the state of a branc

Git

Global Settings

Related Setup: https://gist.github.com/hofmannsven/6814278
Related Pro Tips: https://ochronus.com/git-tips-from-the-trenches/
Interactive Beginners Tutorial: http://try.github.io/
Git Cheatsheet by GitHub: https://services.github.com/on-demand/downloads/github-git-cheat-sheet/

Reminder

Press minus + shift + s and return to chop/fold long lines!

Change default Mac OS X PHP to MAMP's PHP Installation and Install Composer Package Management

Instructions to Change PHP Installation

First, Lets find out what version of PHP we're running (To find out if it's the default version).

To do that, Within the terminal, Fire this command:

which php

	var express = require('express');
	var session = require('express-session');
	var cookieParser = require('cookie-parser');
	var flash = require('connect-flash');
	var app = express();

	app.use(cookieParser('secret'));
	app.use(session({cookie: { maxAge: 60000 }}));
	app.use(flash());

	# -----------------------------------------------------------------
	# .gitignore
	# Bare Minimum Git
	# https://salferrarello.com/starter-gitignore-file/
	# ver 20221125
	#
	# From the root of your project run
	# curl -O https://gist.githubusercontent.com/salcode/10017553/raw/.gitignore
	# to download this file
	#

	# -----------------------------------------------------------------
	# .gitignore for WordPress
	# Bare Minimum Git
	# http://ironco.de/bare-minimum-git/
	# ver 20150227
	#
	# This file is tailored for a WordPress project
	# using the default directory structure
	#
	# This file specifies intentionally untracked files to ignore

	var CrossfadeSample = {playing:false};

	CrossfadeSample.play = function() {
	// Create two sources.
	this.ctl1 = createSource(BUFFERS.drums);
	this.ctl2 = createSource(BUFFERS.organ);
	// Mute the second source.
	this.ctl1.gainNode.gain.value = 0;
	// Start playback in a loop
	if (!this.ctl1.source.start) {

	//http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
	Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);