error: Your local changes to the following files would be overwritten by merge:

file/name/path

some/more/filenamepath

Please, commit your changes or stash them before you can merge.

Aborting