root@idefix:/var/www/newz# git pull https://github.com/nZEDb/nZEDb dev
D       Changelog
A       cli/verify_permissions.php
M       docs/Ubuntu_Install_Guide.md
M       libs/AmazonProductAPI.php
M       misc/sphinxsearch/README.md
M       misc/sphinxsearch/create_se_tables.php
A       misc/sphinxsearch/toggle_search_type.php
M       misc/testing/DB/convert_from_newznab.php
M       misc/testing/DB/reset_postprocessing.php
M       misc/testing/Dev/rename_u4e.php
M       misc/testing/Dev/test_misc_sorter.php
M       misc/testing/Release/gamesorter.php
M       misc/update/nix/multiprocessing/.do_not_run/switch.php
M       misc/update/nix/tmux/bin/fixreleasenames.php
M       misc/update/nix/tmux/bin/groupfixrelnames.php
M       misc/update/postprocess.php
M       misc/update/python/groupfixrelnames_threaded.py
M       misc/update/update_releases.php
U       nzedb/build/nZEDb.xml
M       nzedb/controllers/Backfill.php
M       nzedb/controllers/Binaries.php
M       nzedb/controllers/Books.php
M       nzedb/controllers/Categorize.php
M       nzedb/controllers/Category.php
M       nzedb/controllers/CollectionsCleaning.php
M       nzedb/controllers/Console.php
M       nzedb/controllers/Forum.php
M       nzedb/controllers/Games.php
M       nzedb/controllers/Genres.php
M       nzedb/controllers/MiscSorter.php
M       nzedb/controllers/Movie.php
M       nzedb/controllers/Music.php
M       nzedb/controllers/NNTP.php
M       nzedb/controllers/NZBContents.php
M       nzedb/controllers/NZBImport.php
M       nzedb/controllers/NameFixer.php
M       nzedb/controllers/Nfo.php
D       nzedb/controllers/PostProcess.php
D       nzedb/controllers/ProcessAdditional.php
D       nzedb/controllers/ProcessReleases.php
M       nzedb/controllers/ReleaseCleaning.php
M       nzedb/controllers/ReleaseComments.php
M       nzedb/controllers/ReleaseRemover.php
M       nzedb/controllers/Releases.php
M       nzedb/controllers/Sharing.php
A       nzedb/controllers/Steam.php
M       nzedb/controllers/Tmux.php
M       nzedb/controllers/TmuxOutput.php
M       nzedb/controllers/TvRage.php
M       nzedb/controllers/UserMovies.php
M       nzedb/controllers/UserSeries.php
M       nzedb/controllers/Users.php
M       nzedb/controllers/XXX.php
M       nzedb/db/DbUpdate.php
M       nzedb/libraries/Cache.php
M       nzedb/libraries/Forking.php
A       nzedb/processing/PostProcess.php
A       nzedb/processing/post/ProcessAdditional.php
A       nzedb/processing/post/ProcessReleases.php
M       nzedb/utility/Versions.php
A       resources/db/patches/mysql/0275~users.sql
A       resources/db/patches/mysql/0276~genres.sql
A       resources/db/patches/mysql/0277~users.sql
A       resources/db/patches/mysql/0278~gamesinfo.sql
A       resources/db/patches/mysql/0279~releases.sql
A       resources/db/patches/mysql/0280~xxxinfo.sql
A       resources/db/patches/mysql/0281~xxxinfo.sql
A       resources/db/patches/mysql/0282~general.sql
A       resources/db/patches/mysql/0283~general.sql
M       resources/db/schema/data/10-forumpost.tsv
M       resources/db/schema/data/10-settings.tsv
M       resources/db/schema/mysql-ddl.sql
M       resources/db/schema/temp.sql
M       www/pages/api.php
M       www/pages/games.php
M       www/pages/queue.php
M       www/themes/Default/templates/frontend/games.tpl
M       www/themes/Default/templates/frontend/viewxxx.tpl
M       www/themes/Default/templates/frontend/xxx.tpl
M       www/themes/alpha/templates/frontend/games.tpl
M       www/themes/alpha/templates/frontend/music.tpl
M       www/themes/alpha/templates/frontend/viewnzb.tpl
M       www/themes_shared/templates/admin/comments-list.tpl
M       www/themes_shared/templates/admin/console-edit.tpl
M       www/themes_shared/templates/admin/music-edit.tpl
M       www/themes_shared/templates/admin/site-edit.tpl
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.