gistfile1.txt

c:\Program Files (x86)\Git\bin\git.exe pull --rebase --progress juriansluiman refs/heads/feature/console
From https://github.com/juriansluiman/zf2
 * branch            feature/console -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: Add strictMode for AbstractOptions
Applying: Simplify strictMode to just a property
Applying: Controller plugin that will help with PRG (see wikipedia link below)
Applying: unit tests for prg plugin
Applying: docblocks for prg plugin
Applying: docs for prg plugin
Applying: renaming to Config, CS fixes
Applying: Remove documentation and composer entry for InfoCard and Wildfire
Applying: fixed DbTable gc
Applying: refactored manager interface
Applying: remove magic
Using index info to reconstruct a base tree...
Done
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
	library/Zend/Session/AbstractManager.php
	library/Zend/Session/Config/ConfigInterface.php
	library/Zend/Session/Config/StandardConfig.php
	library/Zend/Session/Container.php
	library/Zend/Session/ManagerInterface.php
	library/Zend/Session/SessionManager.php
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Patch failed at 0011 remove magic

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".