ngocnguyenth

Git Branch Merging Best Practices

After you've selected a feature to work on, create a branch in your local repo to build it in.
- $ git checkout -b calaway/short_description_of_feature
Implement the requested feature, make sure all tests are passing, and commit all changes in the new branch.
Checkout the master branch locally.
- $ git checkout master
Pull down the master branch from GitHub to get the most up to date changes from others. If you practice git workflow as described here you should never have a merge conflict at this step.
- $ git pull origin master
Make sure all tests are passing on master and then checkout your new branch.

-'''
-Compares all lines in a given file and removes duplicates.
-'''
-import sys
-import time as t
-def get_time():
-	return t.strftime('%H:%M:%S')

	#!/bin/bash
	#
	# Example of how to parse short/long options with 'getopt'
	#

	OPTS=`getopt -o vhns: --long verbose,dry-run,help,stack-size: -n 'parse-options' -- "$@"`

	if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi

	echo "$OPTS"

	docker run \
	--name={{.Name}} \
	{{range $e := .Config.Env}}--env={{printf "%q" $e}} \
	{{end}}{{range $p, $conf := .NetworkSettings.Ports}}{{with $conf}}-p {{(index $conf 0).HostIp}}:{{(index $conf 0).HostPort}}:{{$p}} \
	{{end}}{{end}}{{range $n, $conf := .NetworkSettings.Networks}}{{with $conf}}--network {{printf "%q" $n}} \
	{{range $conf.Aliases}}--network-alias {{printf "%q" .}} {{end}} \
	{{end}}{{end}}{{range $v := .HostConfig.VolumesFrom}}--volumes-from={{printf "%q" .}} \
	{{end}}{{range $v := .HostConfig.Binds}}--volume={{printf "%q" .}} \
	{{end}}{{range $l, $v := .Config.Labels}}--label {{printf "%q" $l}}={{printf "%q" $v}} \
	{{end}}{{range $v := .HostConfig.CapAdd}}--cap-add {{printf "%q" .}} \

	sed -i '/<pattern>/s/^/#/g' file #comment
	sed -i '/<pattern>/s/^#//g' file #uncomment