Chris Walsh attrition

## simple-git-branching-model.md

      
              4 files
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                attrition
                / simple-git-branching-model.md
            
            
              Created
              August 11, 2017 21:24
                — forked from chalasr/simple-git-branching-model.md
            
              
                a simple git branching model
              
          
    a simple git branching model

This is a very simple git workflow. It (and variants) is in use by many people.
I settled on it after using it very effectively at Athena.
GitHub does something similar; Zach Holman mentioned  it
in this talk.
Update: Woah, thanks for all the attention. Didn't expect this simple rant
to get popular.

  
## Program.cs
using System;
using System.IO;
using System.Collections.Generic;
using System.Linq;
using System.Windows.Forms;

namespace AscMapSubset
{
    static class Program
    {

## index.html
<html>
    <body id="body">
        <div id="main_area">
            <canvas id="canvas" width="700" height="700"></canvas>
            <h1>Lights Out! Clone</h1>
            <p>
                New Game:
                <input type="button" value="Easy" onClick="newGame(0);" />
                <input type="button" value="Medium" onClick="newGame(1);" />
                <input type="button" value="Hard" onClick="newGame(2);" />

## .gitignore
## Unity
# Ignore The following directories / file extensions
Library
Temp

# Ignore the following file extensions
*.exe
*.vcproject
*.sln
*.csproj

## ParticleReadData.cpp
array<Vector3>^ ParticleReadData::GetPositionBuffer()
{
	// get array of vectors, treat them as array of floats
	const PxVec3* p1 = this->UnmanagedPointer->positionBuffer.ptr();
	float* p = (float*)p1;

	if (p1 == NULL)
		return nullptr;

	int n = this->UnmanagedPointer->numValidParticles;

## SceneChaseCamera.cs
using UnityEngine;
using UnityEditor;

public class SceneChaseCam : EditorWindow
{
    bool active = false;
    bool followSelection = false;
    Transform toFollow;

    // Add menu named "Scene Chase Cam" to the Window menu
	using System;
	using System.IO;
	using System.Collections.Generic;
	using System.Linq;
	using System.Windows.Forms;

	namespace AscMapSubset
	{
	static class Program
	{
	<html>
	<body id="body">
	<div id="main_area">
	<canvas id="canvas" width="700" height="700"></canvas>
	<h1>Lights Out! Clone</h1>
	<p>
	New Game:
	<input type="button" value="Easy" onClick="newGame(0);" />
	<input type="button" value="Medium" onClick="newGame(1);" />
	<input type="button" value="Hard" onClick="newGame(2);" />
	## Unity
	# Ignore The following directories / file extensions
	Library
	Temp

	# Ignore the following file extensions
	*.exe
	*.vcproject
	*.sln
	*.csproj
	array<Vector3>^ ParticleReadData::GetPositionBuffer()
	{
	// get array of vectors, treat them as array of floats
	const PxVec3* p1 = this->UnmanagedPointer->positionBuffer.ptr();
	float* p = (float*)p1;

	if (p1 == NULL)
	return nullptr;

	int n = this->UnmanagedPointer->numValidParticles;
	using UnityEngine;
	using UnityEditor;

	public class SceneChaseCam : EditorWindow
	{
	bool active = false;
	bool followSelection = false;
	Transform toFollow;

	// Add menu named "Scene Chase Cam" to the Window menu