Becky BeckyDTP

Git-workflow or feature branching

When working with Git, there are 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, and the focus of this article.

If you are new to Git and Git-workflows, I suggest reading the [atlassian.com Git Workflow][article] 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][git-auto]. This tool will assist you to better visualize the state of a branch in regards to changes and being in sync with the remote repo.

Basic branching

CREATE

Clone an existing repository

$ git clone ssh://[email protected]/repo.git

Create a new local repository

$ git init

	# Terminal Cheat Sheet

	pwd # print working directory
	ls # list files in directory
	cd # change directory
	~ # home directory
	.. # up one directory
	- # previous working directory
	help # get help
	-h # get help

	qApp.setStyle("Fusion")

	dark_palette = QPalette()

	dark_palette.setColor(QPalette.Window, QColor(53, 53, 53))
	dark_palette.setColor(QPalette.WindowText, Qt.white)
	dark_palette.setColor(QPalette.Base, QColor(25, 25, 25))
	dark_palette.setColor(QPalette.AlternateBase, QColor(53, 53, 53))
	dark_palette.setColor(QPalette.ToolTipBase, Qt.white)
	dark_palette.setColor(QPalette.ToolTipText, Qt.white)

	sub, sup {
	/* Specified in % so that the sup/sup is the
	right size relative to the surrounding text */
	font-size: 75%;

	/* Zero out the line-height so that it doesn't
	interfere with the positioning that follows */
	line-height: 0;

	/* Where the magic happens: makes all browsers position

	/*
	Pure CSS ePub theme detection (White / Sepia / Night) in iBooks (Mac OS and iOS included)
	Version 1.1
	Note that iBooks actually uses internal JavaScript to set the "__ibooks_internal_theme" attribute on :root (html) element
	every time the theme is changed, but this happens independently of whether your epub html markup is scripted or not.

	Discovered and tested in iBooks on Mac, iPhone and iPad by
	https://twitter.com/adaptivegarage
	*/

	"""
	Simplifies the process of grepping EPUB files.
	Grep must be installed for this script to work.

	Copyright (c) 2016 Carter Yagemann

	Permission is hereby granted, free of charge, to any person obtaining a copy of this
	software and associated documentation files (the "Software"), to deal in the Software
	without restriction, including without limitation the rights to use, copy, modify, merge,
	publish, distribute, sublicense, and/or sell copies of the Software, and to permit