Randy Rowland rowland007

Git Flow & Branching

The Main Branches

At the core, the development model is greatly inspired by existing models out there. The central repo holds two main branches with an infinite lifetime:

master
develop

In our project’s Git repository, two branches currently exist: the usual master branch, and a feature branch that we created right after the initial commit. On the master branch, we have italicized the ‘a’, then bolded the ‘a’. On our feature branch, we have italicized the ‘b’, and then bolded the ‘b’.

Merge

By merging feature into master, master obtains a new commit — a “merge commit”.

Keep a Downstream git Repository Current with Upstream Repository Changes

A downstream repository (aka a “fork”) maintainer commonly needs to stay current with upstream work (aka "original"). The case is development continues on the upstream repo while you work on your own origin fork. You want to fetch the upstream changes and apply them to your origin so you don't make conflicts.

The following steps allow you to achieve this on the command line in a local git repository.

Add the Remote Upstream Repository

Global configuration

git config --global user.name "Randy Rowland"
git config --global user.email [email protected]
git config --global user.signingkey E80A8931C1245241F2BE03D6F32E17D74D6DE172
git config --global commit.gpgsign true

Git Message Template

Shakespeare Sonnet++ Postmortem (incident #465)

Date

2015-10-21

Authors

jennifer
martym

	[Desktop Entry]
	Type=Application
	Exec=/usr/bin/syncthing -no-browser
	Hidden=false
	X-GNOME-Autostart-enabled=true
	Name[en_US]=Syncthing
	Name=Syncthing

	# Place this file in ~/.config/autostart/ to have syncthing begin as soon as $USER logs in

	#!/bin/bash -e
	if [[ $EUID -ne 0 ]]; then
	echo "This script must be run as root"
	exit 1
	fi

	cd /home/$USER/
	echo "Changing directory to: $(pwd)"

	echo "Removing bloatware..."

	# ~/.bashrc: executed by bash(1) for non-login shells.

	# If not running interactively, don't do anything
	case $- in
	i) ;;
	*) return;;
	esac

	# don't put duplicate lines or lines starting with space in the history.
	HISTCONTROL=ignoreboth

	#!/bin/bash -e
	if [[ $EUID -ne 0 ]]; then
	echo "This script must be run as root"
	exit 1
	fi

	# Download the latest version of python-pip
	wget https://bootstrap.pypa.io/get-pip.py

	# Install pip

	[Desktop Entry]
	Encoding=UTF-8
	Name=BrowserVM
	Exec=qvm-open-in-dvm %u
	Terminal=false
	X-MultipleArgs=false
	Type=Application
	Categories=Network;WebBrowser;
	MimeType=x-scheme-handler/unknown;x-scheme-handler/about;text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;