gistfile1.txt

# git pull
poeritz-kai@firma.andrick.de's password: 
remote: Counting objects: 102, done.
remote: Compressing objects: 100% (102/102), done.
remote: Total 102 (delta 86), reused 0 (delta 0)
Empfange Objekte: 100% (102/102), 11.03 KiB | 0 bytes/s, Fertig.
Löse Unterschiede auf: 100% (86/86), abgeschlossen mit 76 lokalen Objekten.
Von ssh://firma.andrick.de:1922/srv/localfs/raid10-backup/data/user/poeritz-kai/data/version-control/git/bare/script-tools
   5cd968b..b2532d0  master     -> origin/master
Aktualisiere 5cd968b..b2532d0
error: Your local changes to the following files would be overwritten by merge:
	bash-script/script/by-distribution/distributions/distribution.gentoo/setup/setup.cups/setup.gentoo.cups.bash
	bash-script/script/by-distribution/distributions/distribution.linux-generic/setup/setup.linux-generic.ansible/setup.linux-generic.ansible.bash
	bash-script/script/by-distribution/distributions/distribution.linux-generic/setup/setup.linux-generic.dmtx-utils/setup.linux-generic.dmtx-utils.bash
	bash-script/script/by-distribution/distributions/distribution.linux-generic/setup/setup.linux-generic.font.adobe-source-code-pro/setup.linx-generic.linux-generic.font.adobe-source-code-pro.bash
	bash-script/script/by-distribution/distributions/distribution.linux-generic/setup/setup.linux-generic.i3/setup.linux-generic.i3.bash
	bash-script/script/by-distribution/distributions/distribution.linux-generic/setup/setup.linux-generic.pdf417_enc/setup.linux-generic.pdf417_enc.bash
	bash-script/script/by-distribution/distributions/distribution.linux-generic/setup/setup.linux-generic.spice-client/setup.linux-generic.spice-client.bash
	bash-script/script/by-distribution/distributions/distribution.ubuntu/ubuntu-live-setup.bash
	bash-script/script/by-hardware-type/ups/apc-ups-network-setup.bash
	bash-script/script/by-todo/pdf-crop-margin.bash
	bash-script/script/by-todo/privacy/clear-history.bash
	bash-script/script/by-todo/tipp10/tipp10.bash
	bash-script/script/by-tool-name-and-use-case/cat/cat-strip-comments.bash
	bash-script/script/by-tool-name/git/git-init-bare.bash
	bash-script/script/by-topic/benchmark/fio/benchmark-fio-jobs.bash
	bash-script/script/by-topic/font/font-show.bash
	bash-script/script/by-topic/kernel-linux/kernel-linux-out-of-tree-module-build.bash
	bash-script/script/by-topic/qt/qt5-setup.bash
Please, commit your changes or stash them before you can merge.
Aborting