gistfile1.txt

-> git reset HEAD --hard
HEAD is now at ba21012 added content plugin
www-data @ access.office.nodesnoc.net [ /home/kj/www/kondi/htdocs/core ] (2.0 *%<>)
-> git submodule update --init --recursive
www-data @ access.office.nodesnoc.net [ /home/kj/www/kondi/htdocs/core ] (2.0 *%<>)
-> git pull origin 2.0
From github.com:nodesagency/core
 * branch            2.0        -> FETCH_HEAD
Auto-merging .gitmodules
Auto-merging Plugin/Assets
CONFLICT (submodule): Merge conflict in Plugin/Assets
Auto-merging Plugin/Shared
CONFLICT (submodule): Merge conflict in Plugin/Shared
Auto-merging Plugin/TwitterBootstrap
CONFLICT (submodule): Merge conflict in Plugin/TwitterBootstrap
Automatic merge failed; fix conflicts and then commit the result.