Page 1 of 1
Tortoise Git Latest Update
Posted: Sun Aug 17, 2014 1:49 pm
by Vargas
I recently updated the server and saw it has server merge files for the config folder under Dps/config. now Ds login, Ds Game, And Ds Search wont open. I'm not sure if i need to edit my files or revert them back.
Re: Tortoise Git Latest Update
Posted: Sun Aug 17, 2014 2:54 pm
by kjLotus
darn, i force pushed to undo that (commit them by accident) hoping that nobody pulled yet. you're just unlucky enough that you pulled in the hour between me noticing
anyways, i only changed the sql password, so you just have to change that back in map_darkstar and login_darkstar
Re: Tortoise Git Latest Update
Posted: Sun Aug 17, 2014 3:13 pm
by Vargas
I checked both files but the password never got changed just these lines got added and idk what there for.
mysql_host: 127.0.0.1
mysql_port: 3306
mysql_login: root
<<<<<<< HEAD
mysql_password: *******
=======
mysql_password: ****
>>>>>>> d2799a54a8fc9652698f25948e6d04d93c76f629
mysql_database: dspdb
Re: Tortoise Git Latest Update
Posted: Sun Aug 17, 2014 4:54 pm
by whasf
It's merge stuff. Just take it out and make sure you have one line with the correct password.