Joachim Wagner jowagner

1. Clone your fork:

git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream

We're happy to say that we recently released the code for the TraceView Ruby instrumentation on Github as Open Source. There are a ton of benefits for AppNeta (and the community) in doing this so making the decision was easy... but the process of actually opening the repository and still keeping a few things private was slightly trickier. Here's the route we took that has worked out really well.

The Situation and Strategy

The Ruby instrumentation has always been sheltered on Github - albeit always in a private Github repository. We used the issues, pull requests and wiki pages extensively for everything from new employee resources to hosting screenshots, customer issues, internal discussions and links to other project and management tools (e.g. Asana).

Outside of the commits and the code, everything else was either of little use to the public or potentially company or customer confidential - stuff that shouldn't or couldn't be shared publicly. So this put us

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

If anyone is interested in setting up their system to automatically (or manually) sign their git commits with their GPG key, here are the steps:

Generate and add your key to GitHub
$ git config --global commit.gpgsign true ([OPTIONAL] every commit will now be signed)
$ git config --global user.signingkey ABCDEF01 (where ABCDEF01 is the fingerprint of the key to use)
$ git config --global alias.logs "log --show-signature" (now available as $ git logs)
$ git config --global alias.cis "commit -S" (optional if global signing is false)
$ echo "Some content" >> example.txt
$ git add example.txt
$ git cis -m "This commit is signed by a GPG key." (regular commit will work if global signing is enabled)

	#!/usr/bin/env python
	"""
	Synchronise block devices over the network

	Copyright 2006-2008 Justin Azoff <[email protected]>
	Copyright 2011 Robert Coup <[email protected]>
	License: GPL

	Getting started:

	#!/usr/bin/env python
	"""
	Synchronise block devices over the network

	Copyright 2006-2008 Justin Azoff <[email protected]>
	Copyright 2011 Robert Coup <[email protected]>
	License: GPL

	Getting started:

	$ autossh -M 33333 -N -f -L 13260:10.150.1.26:3260 sg

	$ yum install -y iscsi-initiator-utils

	$ iscsiadm -m discovery -t sendtargets -p 127.0.0.1:13260

	$ vim /var/lib/iscsi/send_targets/127.0.0.1\,13260/iqn.1997-05.com.amazon\:myvolume\,10.150.1.26\,3260\,1\,default/default
	#node.conn[0].address = 10.150.1.26
	#node.conn[0].port = 3260
	node.conn[0].address = 127.0.0.1

	#!/usr/bin/env python
	"""
	Synchronise block devices over the network

	Copyright 2006-2008 Justin Azoff <[email protected]>
	Copyright 2011 Robert Coup <[email protected]>
	Copyright 2012 Holger Ernst <[email protected]>
	Copyright 2014 Robert McQueen <[email protected]>
	License: GPL

	"""
	Minimal character-level Vanilla RNN model. Written by Andrej Karpathy (@karpathy)
	BSD License
	"""
	import numpy as np

	# data I/O
	data = open('input.txt', 'r').read() # should be simple plain text file
	chars = list(set(data))
	data_size, vocab_size = len(data), len(chars)