octopus merge pull requests from upstream

.gitconfig

[remote "origin"]
    fetch = +refs/pull/*/head:refs/gh-pull/remotes/origin/*
[remote "upstream"]
    fetch = +refs/pull/*/head:refs/gh-pull/remotes/upstream/*

console

 Sami git:develop ✗  git rv                                                                  ~/Web Development/Sami
origin	[email protected]:havvg/Sami.git (fetch)
origin	[email protected]:havvg/Sami.git (push)
upstream	git://github.com/fabpot/Sami.git (fetch)
upstream	git://github.com/fabpot/Sami.git (push)
 Sami git:develop ✗  git fa                                                                  ~/Web Development/Sami
Fetching origin
Fetching upstream
From git://github.com/fabpot/Sami
 * [new ref]         refs/pull/1/head -> refs/gh-pull/remotes/upstream/1
 * [new ref]         refs/pull/10/head -> refs/gh-pull/remotes/upstream/10
 * [new ref]         refs/pull/13/head -> refs/gh-pull/remotes/upstream/13
 * [new ref]         refs/pull/15/head -> refs/gh-pull/remotes/upstream/15
 * [new ref]         refs/pull/16/head -> refs/gh-pull/remotes/upstream/16
 * [new ref]         refs/pull/17/head -> refs/gh-pull/remotes/upstream/17
 * [new ref]         refs/pull/19/head -> refs/gh-pull/remotes/upstream/19
 * [new ref]         refs/pull/23/head -> refs/gh-pull/remotes/upstream/23
 * [new ref]         refs/pull/24/head -> refs/gh-pull/remotes/upstream/24
 * [new ref]         refs/pull/25/head -> refs/gh-pull/remotes/upstream/25
 * [new ref]         refs/pull/26/head -> refs/gh-pull/remotes/upstream/26
 * [new ref]         refs/pull/4/head -> refs/gh-pull/remotes/upstream/4
 * [new ref]         refs/pull/5/head -> refs/gh-pull/remotes/upstream/5
 * [new ref]         refs/pull/6/head -> refs/gh-pull/remotes/upstream/6
 * [new ref]         refs/pull/7/head -> refs/gh-pull/remotes/upstream/7
 * [new ref]         refs/pull/8/head -> refs/gh-pull/remotes/upstream/8
 Sami git:develop ✗  git merge refs/gh-pull/remotes/upstream/5 refs/gh-pull/remotes/upstream/6 refs/gh-pull/remotes/upstream/8 refs/gh-pull/remotes/upstream/26
Trying simple merge with refs/gh-pull/remotes/upstream/5
Simple merge did not work, trying automatic merge.
Auto-merging Sami/Sami.php
Trying simple merge with refs/gh-pull/remotes/upstream/6
Simple merge did not work, trying automatic merge.
Auto-merging Sami/Resources/themes/default/pages/class.twig
Trying simple merge with refs/gh-pull/remotes/upstream/8
Simple merge did not work, trying automatic merge.
Auto-merging Sami/Project.php
Auto-merging Sami/Resources/themes/default/pages/class.twig
ERROR: content conflict in Sami/Resources/themes/default/pages/class.twig
fatal: merge program failed
Automated merge did not work.
Should not be doing an Octopus.
Merge with strategy octopus failed.
 Sami git:develop ✗ + git st                                                                 ~/Web Development/Sami
# On branch develop
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   Sami/Parser/ClassVisitor/ExampleClassVisitor.php
#	new file:   Sami/Parser/ClassVisitor/MethodClassVisitor.php
#	modified:   Sami/Project.php
#	modified:   Sami/Reflection/Reflection.php
#	modified:   Sami/Renderer/TwigExtension.php
#	modified:   Sami/Resources/themes/default/stylesheet.css
#	modified:   Sami/Sami.php
#	new file:   Sami/Tests/Parser/ClassVisitor/MethodClassVisitorTest.php
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add <file>..." to mark resolution)
#
#	both modified:      Sami/Resources/themes/default/pages/class.twig
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	composer.lock
 Sami git:develop ✗ + mate Sami/Resources/themes/default/pages/class.twig                    ~/Web Development/Sami
 Sami git:develop ✗ + git add Sami/Resources/themes/default/pages/class.twig                 ~/Web Development/Sami
 Sami git:develop ✗ + git st                                                                 ~/Web Development/Sami
# On branch develop
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   Sami/Parser/ClassVisitor/ExampleClassVisitor.php
#	new file:   Sami/Parser/ClassVisitor/MethodClassVisitor.php
#	modified:   Sami/Project.php
#	modified:   Sami/Reflection/Reflection.php
#	modified:   Sami/Renderer/TwigExtension.php
#	modified:   Sami/Resources/themes/default/pages/class.twig
#	modified:   Sami/Resources/themes/default/stylesheet.css
#	modified:   Sami/Sami.php
#	new file:   Sami/Tests/Parser/ClassVisitor/MethodClassVisitorTest.php
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	composer.lock
 Sami git:develop ✗ + git ci                                                                 ~/Web Development/Sami
[develop 30cf827] merge pull requests 5, 6, 8 and 26
 9 files changed, 406 insertions(+), 8 deletions(-)
 create mode 100644 Sami/Parser/ClassVisitor/ExampleClassVisitor.php
 create mode 100644 Sami/Parser/ClassVisitor/MethodClassVisitor.php
 create mode 100644 Sami/Tests/Parser/ClassVisitor/MethodClassVisitorTest.php
 Sami git:develop ✗  git st                                                                  ~/Web Development/Sami
# On branch develop
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	composer.lock
nothing added to commit but untracked files present (use "git add" to track)
 Sami git:develop ✗  git ph                                                                  ~/Web Development/Sami
* 30cf827 - (HEAD, develop) merge pull requests 5, 6, 8 and 26 (23 seconds ago) <Toni Uebernickel>
..