Nicholas Hagen nicholashagen

The following code is day-to-day operations when working with 3 forks: an open source project, a local fork of that project, and a company fork of that project. The power of Git is remote aliases that allow you to work with all 3 forks in parallel in the same code base and instantly compare, push, merge, etc.

Setup:

#> git clone [url of local fork: ie: username/project]
#> cd project
#> git remote add project [url of project: ie: project/project]
#> git remote add company [url of company fork: ie: company/project]

Git Workflow for Feature Branches

The following is an example workflow for developing on a temporary branch and merging back to the main branch squashing all commits into a single commit. This assumes you already have a branch named branch-xyz and have finished the work on that branch.

Step 1: Checkout the feature branch

git checkout branch-xyz

Download Source

#> wget http://download.silicondust.com/hdhomerun/libhdhomerun_20130117.tgz
#> tar zxvf libhdhomerun_20130117.tgz

	/**
	* Simple definition of a dynamic MBean, named "SimpleDynamic".
	*
	* The "SimpleDynamic" dynamic MBean shows how to expose for management
	* attributes and operations, at runtime, by implementing the
	* "javax.management.DynamicMBean" interface.
	*
	* This MBean exposes for management two attributes and one operation:
	* - the read/write "State" attribute,
	* - the read only "NbChanges" attribute,

	package com.znet.examples.sse;

	import java.io.IOException;
	import java.io.PrintWriter;
	import java.util.concurrent.Callable;
	import java.util.concurrent.ExecutorService;
	import java.util.concurrent.Executors;
	import java.util.concurrent.Future;

	import javax.servlet.ServletConfig;

	import javax.management.*
	import javax.management.remote.*

	def creds = [ 'username', 'password' ] as String[]
	def env = [ (JMXConnector.CREDENTIALS) : creds ]
	def serverUrl = 'service:jmx:rmi:///jndi/rmi://hostname:port/jmxrmi'
	def server = JMXConnectorFactory.connect(new JMXServiceURL(serverUrl), env).MBeanServerConnection
	new GroovyMBean(server, 'java.lang:type=Threading').dumpAllThreads(true, true).each { thread ->
	println "THREAD: ${thread.threadName}"
	}

	import 'dart:mirrors';

	class System {

	static final Map<String, TController> _controllers = new Map();
	static final Map<String, TService> _services = new Map();

	static TController loadController(Symbol name) {
	TController controller = _controllers[name];
	if (controller == null) {

	public class LoadTest {

	public static void main(String[] args) {
	// int count = 5000;
	int count = 25000;
	// int count = 100000;
	// int count = 250000;

	long s = System.nanoTime();
	for (int i = 0; i < 1000; i++) {

	@Grab(group='org.codehaus.groovy.modules.http-builder', module='http-builder', version='0.6' )

	import groovyx.net.http.*
	import groovyx.net.http.RESTClient
	import static groovyx.net.http.ContentType.URLENC
	import static groovyx.net.http.ContentType.*
	import static groovyx.net.http.Method.*

	// this fails
	try {

	/* ASSUME FOLLOWING OBJECT MODEL

	class Address {
	String street
	String city
	}

	class Role {
	boolean admin
	String type

Nicholas Hagen nicholashagen

Git Workflow for Feature Branches

Step 1: Checkout the feature branch

Download Source

Install Tools