Pablo Pazos Gutiérrez ppazos

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

Mirth Server Setup

First create ec2 Ubuntu instance

Then install all the things needed for Mirth Connect (following this video: http://www.youtube.com/watch?v=omZyAO2naqs)

# Update Ubuntu
sudo aptitude update

# Safe upgrade of Ubuntu
sudo aptitude safe-upgrade

How-to setup a simple git push deployment

These are my notes basically. At first i created this gist just as a reminder for myself. But feel free to use this for your project as a starting point. If you have questions you can find me on twitter @thomasf https://twitter.com/thomasf This is how i used it on a Debian Wheezy testing (https://www.debian.org/releases/testing/)

Discuss, ask questions, etc. here https://news.ycombinator.com/item?id=7445545

	<html>
	<head>
	<title>Post-It Board</title>

	<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.1/themes/base/jquery-ui.css">
	<link rel="stylesheet" type="text/css" href="styles.css">
	</head>
	<body id="board">

	<script src="http://code.jquery.com/jquery-1.9.1.js"></script>

	/**
	* Use log4j in a groovy script, with configuration from a groovy like config file
	*
	* As asked in this
	* <a href="http://stackoverflow.com/questions/19868180/groovy-script-and-log4j">stackoverflow question - groovy-script-and-log4j</a>
	*
	*
	* Tested with Java 7, Groovy 2.1.9
	* User: kon
	* Date: 9/11/13

	import java.util.regex.Matcher
	import java.util.regex.Pattern

	//Tring to capture whats inside the curly brackets
	String input="xxx{var23.ID}yyy{something here.some more}--{}"

	//The group is everything but a '}'
	def pattern = ~/\{([^\}]*)\}/

	def result=pattern.matcher(input)

	<html lang="en">
	<head>

	</head>
	<body>


	<pre>
	<script type="text/javascript">

	<!--
	To force Tomcat to redirect and revert all requested HTTP traffic over to HTTPS, configure the `conf/web.xml` file with the below block.
	This should be placed at the very end of the file near and above the ending `</webapp>` tag:
	-->
	<security-constraint>
	<web-resource-collection>
	<web-resource-name>Automatic Forward to HTTPS/SSL
	</web-resource-name>
	<url-pattern>/*</url-pattern>
	</web-resource-collection>

	git fetch --all
	git reset --hard origin/master
	git pull origin master

	<select name="state">
	<option value="AL">Alabama</option>
	<option value="AK">Alaska</option>
	<option value="AZ">Arizona</option>
	<option value="AR">Arkansas</option>
	<option value="CA">California</option>
	<option value="CO">Colorado</option>
	<option value="CT">Connecticut</option>
	<option value="DE">Delaware</option>
	<option value="FL">Florida</option>

Pablo Pazos Gutiérrez ppazos

Git-workflow vs feature branching

Mirth Server Setup

How-to setup a simple git push deployment

On the server (example.com)