html
php
css
c
xml
python
mysql
database
linux
ruby-on-rails
objective-c
visual-studio
flash
html5
perl
facebook
oracle
mvc
asp
dom
You have local changes in your working directory as indicated by:
error: Your local changes to the following files would be overwritten by merge: src/server/game/Scripting/ScriptLoader.cpp src/server/scripts/Custom/CMakeLists.txt
Commit, reset or stash these and then continue.