merge.txt

#<Git::GitExecuteError: git '--git-dir=/tmp/thumbs/develop.3691ac4.feature_riak-2559_worker-pool-replacement.5fbc219/.git' '--work-tree=/tmp/thumbs/develop.3691ac4.feature_riak-2559_worker-pool-replacement.5fbc219' merge '-m' 'merge' '5fbc219e5023997a8af05b852e2186ba9b9a1151'  2>&1:error: Your local changes to the following files would be overwritten by merge:
	include/riak_core_vnode.hrl
	priv/riak_core.schema
	rebar.config
	src/riak_core.app.src
	src/riak_core_app.erl
	src/riak_core_sup.erl
	src/riak_core_throttle.erl
	src/riak_core_vnode.erl
	src/riak_core_vnode_sup.erl
	src/riak_core_vnode_worker.erl
	src/riak_core_vnode_worker_pool.erl
	test/core_vnode_eqc.erl
	test/sync_command_test.erl
	test/worker_pool_pulse.erl
	test/worker_pool_test.erl
	tools.mk
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
	README_JOBS.md
	include/riak_core_job.hrl
	src/riak_core_job.erl
	src/riak_core_job_internal.hrl
	src/riak_core_job_manager.erl
	src/riak_core_job_runner.erl
	src/riak_core_job_service.erl
	src/riak_core_job_sup.erl
	src/riak_core_sup_internal.hrl
	test/jobs_test_util.erl
	test/riak_core_jobs_tests.erl
Please move or remove them before you can merge.
Aborting>