===@===:~/Workspace/shogun/src/shogun$ git pull upstream master
From git://github.com/shogun-toolbox/shogun
 * branch            master     -> FETCH_HEAD
Merge made by recursive.
 src/shogun/features/BinnedDotFeatures.cpp |    1 +
 testsuite/python_modular/tester.py        |   14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)
===@===:~/Workspace/shogun/src/shogun$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: state of fehlersuche
Applying: bugfixes and debug messages
Applying: added flag to allocate_data_from_scratch to not allocate non-scalar non-sgobject data
Applying: removed delte_all_but_data method because this stuff is now done in destructor of TParameter
Applying: migration bugfixes, debug messages and cleanups
Applying: cleanups
Applying: another fix for arrays of SGObjects
Applying: fixed another bug regarding empty parameter bases
Applying: fixed python typemaps
Applying: remove debug code / string typemap
Applying: add -f option to tester to only show failed tests
Applying: initializ m_features with NULL / fixes hang
Applying: show case / exception in tester
Applying: state of fehlersuche
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging src/shogun/base/Parameter.cpp
CONFLICT (content): Merge conflict in src/shogun/base/Parameter.cpp
Auto-merging src/shogun/base/SGObject.cpp
CONFLICT (content): Merge conflict in src/shogun/base/SGObject.cpp
Failed to merge in the changes.
Patch failed at 0014 state of fehlersuche