I think you meant to merge this into your fork, not the main one.
Just FYI - Be careful if you're using this to merge changes from a test game to a real server. With the game config under version control, it will automatically attempt to commit test-game changes to the config and import them to the real-game when you update the code. While this has benefits (e.g. in your skills system) there are some config settings that must be different between test and real, like the server and database config. If you accidentally port those changes from test to real, your game will not work.
I think you meant to merge this into your fork, not the main one.
Just FYI - Be careful if you're using this to merge changes from a test game to a real server. With the game config under version control, it will automatically attempt to commit test-game changes to the config and import them to the real-game when you update the code. While this has benefits (e.g. in your skills system) there are some config settings that must be different between test and real, like the server and database config. If you accidentally port those changes from test to real, your game will not work.