Alexander Khlopov Sysa

There are many Git workflows out there, I heavily suggest also reading the atlassian.com [Git Workflow][article] article as there is more detail then presented here.

The two prevailing workflows are [Gitflow][gitflow] and [feature branches][feature]. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited.

When using Bash in the command line, it leaves a bit to be desired when it comes to awareness of state. I would suggest following these instructions on [setting up GIT Bash autocompletion][git-auto].

Basic branching

When working with a centralized workflow the concepts are simple, master represented the official history and is always deployable. With each now scope of work, aka feature, the developer is to create a new branch. For clarity, make sure to use descriptive names like transaction-fail-message or github-oauth for your branches.

I just had to set up Jenkins to use GitHub. My notes (to myself, mostly):

Detailed Instructions

For setting up Jenkins to build GitHub projects. This assumes some ability to manage Jenkins, use the command line, set up a utility LDAP account, etc. Please share or improve this Gist as needed.

Install Jenkins Plugins

get both the git and github plugin
http://wiki.jenkins-ci.org/display/JENKINS/Git+Plugin

When you cancel a Jenkins job

Unfinished draft; do not use until this notice is removed.

We were seeing some unexpected behavior in the processes that Jenkins launches when the Jenkins user clicks "cancel" on their job. Unexpected behaviors like:

apparently stale lockfiles and pidfiles
overlapping processes
jobs apparently ending without performing cleanup tasks
jobs continuing to run after being reported "aborted"

	import hudson.model.*;
	import hudson.util.*;
	import jenkins.model.*;
	import hudson.FilePath.FileCallable;
	import hudson.slaves.OfflineCause;
	import hudson.node_monitors.*;

	hosts = getProperty('HostsForCleanup')
	hosts = hosts.split("\n")
	EmailToReport = getProperty('EmailToReport')

	import com.cloudbees.hudson.plugins.folder.Folder
	import hudson.FilePath
	import jenkins.model.Jenkins

	def boolean isFolder(String name) {
	def item = Jenkins.instance.getItemByFullName(name)
	return item instanceof Folder
	}

	def deleteUnusedWorkspace(FilePath root, String path) {