Workflow - olw/olw.github.io GitHub Wiki

Used Services

Setting up a new project

In this example you'll learn how to set up a new project for the open learn ware organization and use it with github and trello.

You need to have accounts on github, trello and trello-github-hooks with the right permissions in order to do this.

Step 1: create github project

  • create a new repository
  • add trello-github-hooks as webhook to this repository
payload-url: "http://tgh.herokuapp.com/push"
payload-version: "application/vnd.github.v3+form"
trigger: "Just the push event."
active: true
  • clone + use it git clone https://github.com/olw/<new-repository>

Step 2: create a new trello label for this project

Step 3: link trello board + github project with trello-github-hooks

name: "olw/<new-respository>" # (the github name)
uid: "QVlNFXdz" # (the trello board uid -> `board-url.split('/')[-2]`)
name: "olw/<new-repository>" # (the github name)
repository: "<the just created new repository>"

Step 4: use it

  • in commit messages: refer the trello card id you're working on → commit message is put as comment onto this card
    • to find out a single card id:
      • either select it and pick the first number of the last part of the url (card-url.split('/')[-1].split('-')[0])
      • or click "Card Actions" → "More Actions..." and look for Card #<number>

Installing git-flow on a Windows machine

(follows the official documentation)

Step 1: install git

  • from the official page
  • make sure to check the "run from normal windows command line" feature (2nd in list)

let's assume now git is installed into C:\Users\you\AppData\Local\Programs\Git

Step 2: install dependencies

  • download util-linux, linintl and libiconv (always the Binaries as zip)
  • unzip the dependencies into the git installation folder (here C:\Users\you\AppData\Local\Programs\Git), merge folders, override if possible

Step 3: install git flow

git clone --recursive git://github.com/nvie/gitflow.git
cd gitflow
contrib/msysgit-install.cmd "C:\Users\you\AppData\Local\Programs\Git"

Step 4: check if it works

git flow help

output should be something like

usage: git flow <subcommand>

Available subcommands are:
   init      Initialize a new git repo with support for the branching model.
   feature   Manage your feature branches.
   release   Manage your release branches.
   hotfix    Manage your hotfix branches.
   support   Manage your support branches.
   version   Shows version information.

Try 'git flow <subcommand> help' for details.
⚠️ **GitHub.com Fallback** ⚠️