merge.txt

#<Git::GitExecuteError: git '--git-dir=/tmp/thumbs/develop.9099f80.mv-bucket-expiry2.1ede7be/.git' '--work-tree=/tmp/thumbs/develop.9099f80.mv-bucket-expiry2.1ede7be' merge '-m' 'merge' '1ede7be78f4fdd422a7d7590f776c3c398c6d77c'  2>&1:error: Your local changes to the following files would be overwritten by merge:
	c_src/atoms.h
	c_src/build_deps.sh
	c_src/eleveldb.cc
	c_src/refobjects.cc
	priv/eleveldb.schema
	src/eleveldb.erl
	test/eleveldb_schema_tests.erl
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
	c_src/router.cc
	c_src/router.h
	src/eleveldb_metadata.erl
Please move or remove them before you can merge.
Aborting>