error Your local changes to the following files would be overwritten by merge tumispiderdeviceconfigini tumispidersettingspyPlease commit your changes or stash them before you merge

This error message is telling you that there are changes made to the local files "tumispider/deviceconfig.ini" and "tumispider/settings.py" that conflict with the changes that are being merged.

To resolve this issue, you have a few options:

1. Commit your changes: If you want to keep your local changes and merge them with the changes being pulled in, you can commit your changes first and then perform the merge. To do this, run the following commands:

git add tumispider/deviceconfig.ini tumispider/settings.py
git commit -m "Committing local changes before merge"
git pull

This will add and commit your changes, and then pull in the changes from the remote repository.

2. Stash your changes: If you don't want to commit your changes yet, you can stash them temporarily and then perform the merge. To do this, run the following command:

git stash

This will stash your changes and revert the files to their state before the changes were made. You can then perform the merge, and once it's complete, you can apply your changes back by running:

git stash apply

3. Discard your changes: If you don't care about the changes you made locally and just want to pull in the changes from the remote repository, you can discard your changes and then perform the merge. To do this, run the following commands:

git checkout -- tumispider/deviceconfig.ini tumispider/settings.py
git pull

This will discard your changes and revert the files to their state in the remote repository, and then pull in the changes from the remote repository