Git branching workflow

# SETUP

## Clone your repo
git clone git@github.com:Softala3XPRT/xprt-app.git

## Add the upstream futurice/xprt-app repo so you can keep your repo in sync with Futurice's
git remote add upstream https://github.com/futurice/xprt-app

# BRANCHING

## Creating a new branch

### Make sure you're on the master branch, and make sure it's up to date with Futurice's master branch

git checkout master
git fetch upstream
git merge upstream/master

### Create the branch
git checkout -b <branch-name>

### Do your work here!

## Changing to existing branch (if you want to work on same branch as team member)

git pull
git checkout <branch-name>

## Pushing a new branch to GitHub

git push -u origin <branch-name>

## Creating pull requests

* You can create pull requests through the GitHub web UI
* You can delete your feature branch after the pull request has been accepted