commit changes

Created by: jagyro

allianceserver@Allianceauth:~/allianceauth$ git pull remote: Counting objects: 40, done. remote: Compressing objects: 100% (10/10), done. remote: Total 40 (delta 25), reused 21 (delta 21), pack-reused 9 Unpacking objects: 100% (40/40), done. From https://github.com/R4stl1n/allianceauth c14e0aec..b0c41598 master -> origin/master Updating 8b42259e..b0c41598 error: Your local changes to the following files would be overwritten by merge: services/managers/teamspeak3_manager.py stock/templates/public/base.html stock/templates/public/index.html Please, commit your changes or stash them before you can merge.

basically, how can i do this