Page 4 of 6
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 8:32 pm
by kjLotus
Delaide wrote:Stashing means you are saving your changes, so you are uploading. That is why you get that. This is honestly why I keep my gitpulls separate from my actual server build, because what you are getting is errors that they do not match.
I use tortoisegit, and how I solved that was by selecting "Revert" or "Clean [up]", or if you do not use tortoisegit, you can do a "git reset --hard" from the git command bash. However, this will set you back to what the original server git pull was, instead of including what you changed. But it will resolve your issue. If you still want to stash your changes, then log in to your git email address with password. The one you log into on github, not on another site.
Here is the information on what a git stash is:
http://git-scm.com/book/en/v1/Git-Tools-Stashing
you are uploading to your local git repository, not to anything over the internet, just to make that clear
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 8:37 pm
by Delaide
Oh, I thought it saved to your git account. Good to know. lol, I have only limited experience myself, but I had the same issues, so dealt with it myself, mostly by reverting my code, and later by separating my folders between two folders, FFXI Server Update (Where I do my pulls) and FFXI Server (Where I actually set up my server and modify any needed code).
Thanks for the info.
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 8:48 pm
by kjLotus
easiest way in my opinion is to just put your changes on a branch, then change to master when you pull, then merge master to your branch - only one repository and is still easy to use
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 9:08 pm
by Aiman
What kjLotus mentioned seemed to work. The thing was there was no config file, but something hidden away in Tortoise git. I was able to pull, but when I rebuilt the server, it closed right away. I tried going a stash pop to see if I could go back and redo it, but I don't think it worked right. Now when I open the server it's missing a lot of files. I keep trying to do a pull, but says I have everything up to date.
Any insight, please?
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 9:28 pm
by kjLotus
check the log for why it's not starting (log folder)
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 9:35 pm
by Aiman
That makes sense. Heh.
Well, the lobby server won't start because:
[25/Feb 20:26][1;35m[SQL][0m Access denied for user 'root'@'localhost' (using password: YES)
The game server:
[1;37m[Info][0m DarkStar - Git Revision Hash: [1;37mf796b6614018d88282640b0117988afb92880af3[0m.
[1;32m[Status][0m do_init: begin server initialization...
[20:29:21][1;37m[Info][0m Console Silent Setting: 0 - [1;32m[OK][0m
[20:29:21][1;32m[Status][0m do_init: map_config is reading - [1;32m[OK][0m
[20:29:21][1;32m[Status][0m luautils::init:lua initializing... - [1;32m[OK][0m
[20:29:21][1;32m[Status][0m do_init: sqlhandle is allocating[20:29:21][1;35m[SQL][0m Access denied for user 'root'@'localhost' (using password: YES)
[20:29:21][1;32m[Status][0m [1;37mluautils::free[0m:lua free... - [1;32m[OK][0m
[20:29:21][1;33m[Warning][0m Memory manager: Memory leaks found and fixed.
I was able to fix it. I didn't realize everything gets reset when doing the pull.
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 9:47 pm
by kjLotus
it does when you stash (if you pop then it puts all your changes back)
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 10:11 pm
by Aiman
Popping seems like not a good idea...? It seems that my old settings.lua was causing problems and it remade it sometime during the process.
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 10:24 pm
by kjLotus
Aiman wrote:Popping seems like not a good idea...? It seems that my old settings.lua was causing problems and it remade it sometime during the process.
what makes you think that?
unlike svn, git does not try to merge if you have UNCOMMITED changes in your working copy, but it will merge if you stash save and stash pop. so you can either commit your changes and it'll merge when you pull, or stash save/pop and it'll merge when you pop
edit: and if you DO have conflicts, it'll tell you and go into merge mode where you can fix them (which you can google easily if that's the case)
Re: Wiki Server Setup Guide
Posted: Wed Feb 25, 2015 11:25 pm
by Aiman
That makes sense. I just had some issues with my old settings lua after the pop and somehow it just replaced to the new settings lua, which had some new code on it.
I had to redo all of the changes, but I think I got them all.
I think the big thing is to learn how to commit my changes, so they merge with the new updates.
Thanks for all the help, though. I really appreciate it.